diff options
| author | Tim Angus <tim@ngus.net> | 2006-02-27 21:05:23 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2006-02-27 21:05:23 +0000 |
| commit | d8b7977fe9791fdddc7e3afd655c506a55a0c428 (patch) | |
| tree | 96e416604aba3240883fde16cd0516f5b10d83d2 | |
| parent | b8d0da94c3014753ce948f5d861ebfebb467eafe (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
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | src/game/g_cmds.c | 6 |
2 files changed, 14 insertions, 0 deletions
@@ -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 |