From e16e27154c005438d1c5a0f756a8c3e3bbdb2a49 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Sun, 30 May 2004 13:59:26 +0000 Subject: * "itemact" no longer selects nothing when a weapon is not held * Changed defaults for ui_smallFont and ui_bigFont --- src/game/g_cmds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/game') 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; -- cgit