diff options
| author | Tim Angus <tim@ngus.net> | 2004-05-30 13:59:26 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2004-05-30 13:59:26 +0000 |
| commit | e16e27154c005438d1c5a0f756a8c3e3bbdb2a49 (patch) | |
| tree | cea73ae604f8fd12aa1d65432885b9449a5355dc /src | |
| parent | b26e835db568d6d8bbf524ac2eaa415385911717 (diff) | |
* "itemact" no longer selects nothing when a weapon is not held
* Changed defaults for ui_smallFont and ui_bigFont
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/g_cmds.c | 2 | ||||
| -rw-r--r-- | src/ui/ui_main.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c index 26367e83..20a58e84 100644 --- a/src/game/g_cmds.c +++ b/src/game/g_cmds.c @@ -1329,7 +1329,7 @@ void Cmd_ActivateItem_f( gentity_t *ent ) if( upgrade != UP_NONE && BG_gotItem( upgrade, ent->client->ps.stats ) ) BG_activateItem( upgrade, ent->client->ps.stats ); - else if( weapon != WP_NONE ) + else if( weapon != WP_NONE && BG_gotWeapon( weapon, ent->client->ps.stats ) ) { //force a weapon change ent->client->ps.pm_flags |= PMF_WEAPON_SWITCH; diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c index 941ec2f0..48de3dde 100644 --- a/src/ui/ui_main.c +++ b/src/ui/ui_main.c @@ -6824,8 +6824,8 @@ static cvarTable_t cvarTable[] = { { &ui_scoreShutoutBonus, "ui_scoreShutoutBonus", "0", CVAR_ARCHIVE}, { &ui_fragLimit, "ui_fragLimit", "10", 0}, { &ui_captureLimit, "ui_captureLimit", "5", 0}, - { &ui_smallFont, "ui_smallFont", "0.25", CVAR_ARCHIVE}, - { &ui_bigFont, "ui_bigFont", "0.4", CVAR_ARCHIVE}, + { &ui_smallFont, "ui_smallFont", "0.2", CVAR_ARCHIVE}, + { &ui_bigFont, "ui_bigFont", "0.5", CVAR_ARCHIVE}, { &ui_findPlayer, "ui_findPlayer", "Sarge", CVAR_ARCHIVE}, { &ui_Q3Model, "ui_q3model", "0", CVAR_ARCHIVE}, { &ui_hudFiles, "cg_hudFiles", "ui/hud.txt", CVAR_ARCHIVE}, |