[nexuiz-commits] r8348 - in trunk/data: . qcsrc/server

[DONOTREPLY at icculus.org]

Author: fruitiex
Date: 2009-12-02 08:36:45 -0500 (Wed, 02 Dec 2009)
New Revision: 8348

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/server/cl_weapons.qc
Log:
disable weapon throwing in mode 1 of weapon_stay, add a g_weapon_throwable cvar (default 1)


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-12-02 13:16:55 UTC (rev 8347)
+++ trunk/data/defaultNexuiz.cfg	2009-12-02 13:36:45 UTC (rev 8348)
@@ -450,7 +450,8 @@
 set g_shootfromcenter 0 "weapon gets moved to the center, shots still come from the barrel of your weapon; visual gun position can still be influenced by cl_gunalign 1 and 2"
 set g_shootfromfixedorigin "" "if set to a string like 0 y z, the gun is moved to the given y and z coordinates. If set to a string like x y z, the whole shot origin is used"
 set g_pinata 0 "if set to 1 you will not only drop your current weapon when you are killed, but you will drop all weapons that you possessed"
-set g_weapon_stay 0 "if set to 1 or 2, weapons stay after they were picked up (1: weapons you don't have yet give you ammo of their type, 2: weapons don't give ammo, but instead players start with one pickup-load of ammo by default, 3: weapons give ammo, weapons only stay as ammo-less ghosts)"
+set g_weapon_stay 0 "if set to 1 or 2, weapons stay after they were picked up (1: weapons you don't have yet give you ammo of their type and they can not be dropped, 2: weapons don't give ammo, but instead players start with one pickup-load of ammo by default, 3: weapons give ammo, weapons only stay as ammo-less ghosts)"
+set g_weapon_throwable 1 "if set to 1, weapons can be dropped"
 set g_powerup_superhealth 1 "if set to 0 the mega health powerup will not spawn on the map"
 set g_powerup_strength 1 "if set to 0 the strength powerup will not spawn on the map"
 set g_powerup_shield 1 "if set to 0 the shield (invincibility) powerup will not spawn on the map"

Modified: trunk/data/qcsrc/server/cl_weapons.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weapons.qc	2009-12-02 13:16:55 UTC (rev 8347)
+++ trunk/data/qcsrc/server/cl_weapons.qc	2009-12-02 13:36:45 UTC (rev 8348)
@@ -271,8 +271,14 @@
 		return;
 	if (g_nexball && w == WEP_GRENADE_LAUNCHER)
 		return;
-	if (!cvar("g_pickup_items") || g_ca)
+	if (!cvar("g_pickup_items"))
 		return;
+	if (g_ca)
+		return;
+	if(!cvar("g_weapon_throwable"))
+		return;
+	if(cvar("g_weapon_stay") == 1)
+		return;
 	if(!W_IsWeaponThrowable(w))
 		return;