summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2006-02-27 21:05:23 +0000
committerTim Angus <tim@ngus.net>2006-02-27 21:05:23 +0000
commitd8b7977fe9791fdddc7e3afd655c506a55a0c428 (patch)
tree96e416604aba3240883fde16cd0516f5b10d83d2 /src/game
parentb8d0da94c3014753ce948f5d861ebfebb467eafe (diff)
* Can't use upgrades while dead anymore (not that you could before, but you'd
get console messages) * Added build option BUILD_MASTER_SERVER
Diffstat (limited to 'src/game')
-rw-r--r--src/game/g_cmds.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index f091ff48..f5e78069 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -1383,6 +1383,9 @@ void Cmd_ActivateItem_f( gentity_t *ent )
if( ent->client->pers.teamSelection != PTE_HUMANS )
return;
+ if( ent->client->pers.classSelection == PCL_NONE )
+ return;
+
if( upgrade != UP_NONE && BG_InventoryContainsUpgrade( upgrade, ent->client->ps.stats ) )
BG_ActivateUpgrade( upgrade, ent->client->ps.stats );
else if( weapon != WP_NONE && BG_InventoryContainsWeapon( weapon, ent->client->ps.stats ) )
@@ -1410,6 +1413,9 @@ void Cmd_DeActivateItem_f( gentity_t *ent )
if( ent->client->pers.teamSelection != PTE_HUMANS )
return;
+ if( ent->client->pers.classSelection == PCL_NONE )
+ return;
+
if( BG_InventoryContainsUpgrade( upgrade, ent->client->ps.stats ) )
BG_DeactivateUpgrade( upgrade, ent->client->ps.stats );
else