gmqcc has vector bit operations now. Switch to using them.

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / defs.qh

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 95dbe48ff3f4e24423ffeabff3d2e27bd9340bb7..17b75aeab646cdf039192b08a029d69b514a7681 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -16,7 +16,7 @@ noref float require_spawnfunc_prefix; // if this float exists, only functions wi
 
 // Globals
 
-float g_cloaked, g_footsteps, g_jump_grunt, g_grappling_hook, g_midair, g_minstagib, g_pinata, g_norecoil, g_minstagib_invis_alpha, g_bloodloss;
+float g_cloaked, g_footsteps, g_grappling_hook, g_minstagib;
 float g_warmup_limit;
 float g_warmup_allguns;
 float g_warmup_allow_timeout;
@@ -191,15 +191,15 @@ void w_ready();
 .void() weapon_think;
 
 //float        PLAYER_WEAPONSELECTION_DELAY = );
-float  PLAYER_WEAPONSELECTION_SPEED = 18;
-vector PLAYER_WEAPONSELECTION_RANGE = '0 20 -40';
+const float    PLAYER_WEAPONSELECTION_SPEED = 18;
+const vector   PLAYER_WEAPONSELECTION_RANGE = '0 20 -40';
 
 // weapon states (self.weaponentity.state)
-float WS_CLEAR                 = 0; // no weapon selected
-float WS_RAISE                 = 1; // raise frame
-float WS_DROP                  = 2; // deselecting frame
-float WS_INUSE                 = 3; // fire state
-float WS_READY                 = 4; // idle frame
+const float WS_CLEAR                   = 0; // no weapon selected
+const float WS_RAISE                   = 1; // raise frame
+const float WS_DROP                    = 2; // deselecting frame
+const float WS_INUSE                   = 3; // fire state
+const float WS_READY                   = 4; // idle frame
 
 // there is 2 weapon tics that can run in one server frame
 #define W_TICSPERFRAME 2
@@ -296,7 +296,7 @@ string W_Apply_Weaponreplace(string in);
 void FixIntermissionClient(entity e);
 void FixClientCvars(entity e);
 
-WEPSET_DECLARE_A(weaponsInMap);
+WepSet weaponsInMap;
 
 .float respawn_countdown; // next number to count
 
@@ -549,7 +549,6 @@ float client_cefc_accumulatortime;
 
 .float spectatee_status;
 .float zoomstate;
-.float bloodloss_timer;
 .float restriction;
 
 .entity clientdata;