From: Samual Lenks <samual@xonotic.org>
Date: Tue, 7 Jan 2014 03:16:40 +0000 (-0500)
Subject: Add another weapontodo comment, remove unused weaponrequest
X-Git-Tag: xonotic-v0.8.0~152^2~117
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=89700dc3479a83446332e5b5159955dec30b25fd;p=xonotic%2Fxonotic-data.pk3dir.git

Add another weapontodo comment, remove unused weaponrequest
---

diff --git a/qcsrc/common/weapons/weapons.qh b/qcsrc/common/weapons/weapons.qh
index 720f65f6e..f05ae184f 100644
--- a/qcsrc/common/weapons/weapons.qh
+++ b/qcsrc/common/weapons/weapons.qh
@@ -33,11 +33,10 @@ const float WR_KILLMESSAGE    =  8; // (SERVER) notification number for kill mes
 const float WR_RELOAD         =  9; // (SERVER) handles reloading for weapon
 const float WR_RESETPLAYER    = 10; // (SERVER) clears fields that the weapon may use
 const float WR_IMPACTEFFECT   = 11; // (CLIENT) impact effect for weapon explosion
-const float WR_SWITCHABLE     = 12; // (CLIENT) decides whether the player is able to switch away from this weapon
-const float WR_PLAYERDEATH    = 13; // (SERVER) called whenever a player dies
-const float WR_GONETHINK      = 14; // (SERVER) logic to run when weapon is lost/switched away from
-const float WR_CONFIG         = 15; // (ALL)    dump weapon cvars to config in data directory (see: sv_cmd dumpweapons)
-const float WR_ZOOMRETICLE    = 16; // (CLIENT) weapon specific zoom reticle
+const float WR_PLAYERDEATH    = 12; // (SERVER) called whenever a player dies
+const float WR_GONETHINK      = 13; // (SERVER) logic to run when weapon is lost
+const float WR_CONFIG         = 14; // (ALL)    dump weapon cvars to config in data directory (see: sv_cmd dumpweapons)
+const float WR_ZOOMRETICLE    = 15; // (CLIENT) weapon specific zoom reticle
 
 // variables:
 string weaponorder_byid;
diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index d91c6c75e..b858dd58c 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -2403,6 +2403,7 @@ void PlayerPreThink (void)
 
 		player_regen();
 
+		// WEAPONTODO: Add a weapon request for this 
 		// rot nex charge to the charge limit
 		if(WEP_CVAR(vortex, charge_rot_rate) && self.vortex_charge > WEP_CVAR(vortex, charge_limit) && self.vortex_charge_rottime < time)
 			self.vortex_charge = bound(WEP_CVAR(vortex, charge_limit), self.vortex_charge - WEP_CVAR(vortex, charge_rot_rate) * frametime / W_TICSPERFRAME, 1);