r3473 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: lordhavoc
Date: 2008-03-02 09:28:19 -0500 (Sun, 02 Mar 2008)
New Revision: 3473

Modified:
   trunk/data/qcsrc/server/cl_impulse.qc
   trunk/data/qcsrc/server/cl_player.qc
   trunk/data/qcsrc/server/cl_weapons.qc
Log:
don't throw weapons (by impulse or death) in several modes


Modified: trunk/data/qcsrc/server/cl_impulse.qc
===================================================================
--- trunk/data/qcsrc/server/cl_impulse.qc	2008-03-02 14:21:55 UTC (rev 3472)
+++ trunk/data/qcsrc/server/cl_impulse.qc	2008-03-02 14:28:19 UTC (rev 3473)
@@ -84,12 +84,7 @@
 	else if (imp == 17)
 	{
 		if(self.deadflag == DEAD_NO)
-		{
-			if (self.weapon != WEP_LASER
-				&& !g_minstagib && !g_instagib
-				&& !g_rocketarena && !g_lms && cvar("g_pickup_items") && !g_nixnex)
-				W_ThrowWeapon(W_CalculateProjectileVelocity(self.velocity, v_forward * 750), '0 0 0', TRUE);
-		}
+			W_ThrowWeapon(W_CalculateProjectileVelocity(self.velocity, v_forward * 750), '0 0 0', TRUE);
 	}
 	// deploy waypoints
 	else if (imp >= 30 && imp <= 49)

Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc	2008-03-02 14:21:55 UTC (rev 3472)
+++ trunk/data/qcsrc/server/cl_player.qc	2008-03-02 14:28:19 UTC (rev 3473)
@@ -250,15 +250,6 @@
 
 void SpawnThrownWeapon (vector org, float w)
 {
-	if (!cvar("g_pickup_items"))
-	if (!g_minstagib)
-	if (!g_instagib)
-		return;
-	if (!w)
-		return;
-	if (w == IT_LASER)
-		return;
-
 	W_ThrowWeapon(randomvec() * 100 + '0 0 200', org - self.origin, FALSE);
 }
 

Modified: trunk/data/qcsrc/server/cl_weapons.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weapons.qc	2008-03-02 14:21:55 UTC (rev 3472)
+++ trunk/data/qcsrc/server/cl_weapons.qc	2008-03-02 14:28:19 UTC (rev 3473)
@@ -88,10 +88,22 @@
 	local .float ammofield;
 
 	w = self.weapon;
-	if(w == WEP_LASER)
+	if (w == 0)
+		return; // just in case
+	if (w == WEP_LASER)
 		return;
-	if(w == 0)
-		return; // just in case
+	if (g_minstagib)
+		return;
+	if (g_instagib)
+		return;
+	if (g_rocketarena)
+		return;
+	if (g_lms)
+		return;
+	if (g_nixnex)
+		return;
+	if (!cvar("g_pickup_items"))
+		return;
 
 	e = self;
 	wep = spawn();