Working on muzzleflash, cleanup a bit

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / weapons.qh

diff --git a/qcsrc/common/weapons/weapons.qh b/qcsrc/common/weapons/weapons.qh
index ba2e8a15e1cd7d63f23fd975759e64100eaf78b7..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;
@@ -72,9 +71,10 @@ string W_FixWeaponOrder_AllowIncomplete(string order);
 string W_FixWeaponOrder_ForceComplete(string order);
 void W_RandomWeapons(entity e, float n);
 
+string GetAmmoPicture(.float ammotype);
+
 #ifdef CSQC
 .float GetAmmoFieldFromNum(float i);
-string GetAmmoPicture(.float ammotype);
 float GetAmmoStat(.float ammotype);
 #endif