Add another weapontodo comment, remove unused weaponrequest

diff --git a/qcsrc/common/weapons/weapons.qh b/qcsrc/common/weapons/weapons.qh
index 720f65f6ea4e41fb1a9a004893a8d3a21ac360e3..f05ae184f805a428f6b92eb1ed7301feeea17fd5 100644 (file)
--- 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 d91c6c75efe27e1b7c801eaf1066a1e9e649d036..b858dd58cd6f7f5cbab0a55bdc5f82f896b3dae0 100644 (file)
--- 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);