From 40b969014e6d0cdfe0fe6cedfc646396a7675acf Mon Sep 17 00:00:00 2001 From: Scott Brooks Date: Tue, 23 Jun 2009 02:14:05 +0000 Subject: [PATCH] In FFA, any items you are holding should be dropped back at random spawn points --- reaction/game/g_combat.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/reaction/game/g_combat.c b/reaction/game/g_combat.c index db9e6ca9..889a5be4 100644 --- a/reaction/game/g_combat.c +++ b/reaction/game/g_combat.c @@ -1514,6 +1514,15 @@ void player_die(gentity_t * self, gentity_t * inflictor, gentity_t * attacker, i } else if (self->client->ps.powerups[PW_BLUEFLAG]) { // only happens in standard CTF Team_ReturnFlag(TEAM_BLUE); } + } else if ( g_gametype.integer == GT_FFA ) { + int i=0; + for (i=0; i < HI_NUM_HOLDABLE; i++) + { + if ( self->client->ps.stats[STAT_HOLDABLE_ITEM] & (1<< i)) + { + RQ3_ResetItem(i); + } + } } }