Merge remote-tracking branch 'origin/master' into samual/weapons

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

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 5228e575c60d849a94c6166a134dfc37dc842b89..95f121713442991c4d3df604c7a83351066cb46a 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -191,12 +191,13 @@ void w_ready();
 .float weapon_nextthink;
 .void() weapon_think;
 
+
 // 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
@@ -293,7 +294,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