From d8b7977fe9791fdddc7e3afd655c506a55a0c428 Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Mon, 27 Feb 2006 21:05:23 +0000
Subject: * Can't use upgrades while dead anymore (not that you could before,
 but you'd   get console messages) * Added build option BUILD_MASTER_SERVER

---
 Makefile          | 8 ++++++++
 src/game/g_cmds.c | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/Makefile b/Makefile
index ca44dd6b..50330f97 100644
--- a/Makefile
+++ b/Makefile
@@ -103,6 +103,10 @@ ifndef USE_LOCAL_HEADERS
 USE_LOCAL_HEADERS=1
 endif
 
+ifndef BUILD_MASTER_SERVER
+BUILD_MASTER_SERVER=0
+endif
+
 #############################################################################
 
 BD=$(BUILD_DIR)/debug-$(PLATFORM)-$(ARCH)
@@ -694,12 +698,16 @@ release: build_release
 build_debug: B=$(BD)
 build_debug: makedirs tools
 	$(MAKE) targets B=$(BD) CFLAGS="$(CFLAGS) $(DEBUG_CFLAGS) $(DEPEND_CFLAGS)"
+ifeq ($(BUILD_MASTER_SERVER),1)
 	$(MAKE) -C $(MASTERDIR) debug
+endif
 
 build_release: B=$(BR)
 build_release: makedirs tools
 	$(MAKE) targets B=$(BR) CFLAGS="$(CFLAGS) $(RELEASE_CFLAGS) $(DEPEND_CFLAGS)"
+ifeq ($(BUILD_MASTER_SERVER),1)
 	$(MAKE) -C $(MASTERDIR) release
+endif
 
 #Build both debug and release builds
 all:build_debug build_release
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
-- 
cgit