From 202c30351f3804d1bce778a22e3c99bac6ba7ddd Mon Sep 17 00:00:00 2001
From: Daniel Simoes <slicer@rq3.com>
Date: Wed, 23 Apr 2003 20:32:28 +0000
Subject: [PATCH] With allWeapon/allItems enable it won't toss weapons/items
 when you die

---
 reaction/ChangeLog       |  1 +
 reaction/game/g_combat.c | 12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/reaction/ChangeLog b/reaction/ChangeLog
index e42adb15..4fe21eec 100644
--- a/reaction/ChangeLog
+++ b/reaction/ChangeLog
@@ -4,6 +4,7 @@
 * Added local cvar cg_RQ3_ssgZoomSensLock to enable or disable the feature above (default enable)
 * Upgraded the gamesource RQ3 is built on from 1.29h to 1.32b
 * Removed most of the unlagged stuff. Only optimized prediction and smooth clients remains.
+* With allWeapon/allItems enable it won't toss weapons/items when you die
 
 # List fixes here for the 3.0 release
 
diff --git a/reaction/game/g_combat.c b/reaction/game/g_combat.c
index a062ab9b..340a4172 100644
--- a/reaction/game/g_combat.c
+++ b/reaction/game/g_combat.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.138  2003/04/23 20:32:28  slicer
+// With allWeapon/allItems enable it won't toss weapons/items when you die
+//
 // Revision 1.137  2003/04/19 15:27:30  jbravo
 // Backing out of most of unlagged.  Only optimized prediction and smooth clients
 // remains.
@@ -413,6 +416,10 @@ void TossClientItems(gentity_t * self)
 	// drop the weapon if not a gauntlet or machinegun
 	weapon = self->s.weapon;
 
+	//Slicer: don't drop weapons with all weapons enable.. 
+	if(g_RQ3_allWeapons.integer)
+		return;
+
 	//Elder: run through player STAT_WEAPONS and drop any unique weapons
 	//That way, we can also account for servers with extra weapons
 	//BTW, that means no cheating to get all weapons or it'll spawn mad!!
@@ -478,6 +485,7 @@ void TossClientItems(gentity_t * self)
 			self->client->uniqueWeapons--;
 			angle += 30;
 			self->client->weaponCount[WP_SSG3000]--;
+			
 		}
 	}
 	//Elder: Always drop the pistol
@@ -493,7 +501,9 @@ void TossClientItems(gentity_t * self)
 		Drop_Item(self, item, angle);
 		angle += 30;
 	}
-
+	//Slicer: don't drop Items with all weapons enable.. 
+	if(g_RQ3_allItems.integer)
+		return;
 	// JBravo: drop all items in the new item system.
 	for (i = HI_NUM_HOLDABLE - 1; i > 0; i--) {
 		if (self->client->ps.stats[STAT_HOLDABLE_ITEM] & (1 << i)) {