From 576880a5b28021fbbcb12881465788bba743b4f8 Mon Sep 17 00:00:00 2001 From: Jonathan Barkley Date: Wed, 20 Apr 2011 01:21:33 +0000 Subject: [PATCH] - 4085 fix --- reaction/code/game/g_items.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/reaction/code/game/g_items.c b/reaction/code/game/g_items.c index e3acfc02..e4ffb949 100644 --- a/reaction/code/game/g_items.c +++ b/reaction/code/game/g_items.c @@ -599,6 +599,11 @@ void Touch_Item(gentity_t * ent, gentity_t * other, trace_t * trace) if (other->client->uniqueWeapons >= g_RQ3_maxWeapons.integer + (bandolierFactor - 1) || ent->s.pos.trDelta[2] != 0) return; + + // Paril: fix/workaround for 4085 + // don't pick up dupe special weapons even if we could. + if ((other->client->ps.stats[STAT_WEAPONS] & (1 << ent->item->giTag)) == (1 << ent->item->giTag)) + return; break; case WP_AKIMBO: default: