X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fdefs.qh;h=5be04141dfce6b62dfc424369323fb7803bd8448;hb=3dbc0b5b9ab0f255ec91b8670aeb7cd62218f873;hp=f452e5110678cdf184e231ae3f00421ad03e03bc;hpb=fb839150d0cd4c4937d183b723b6cc1ed250c66a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index f452e5110..5be04141d 100644
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -221,10 +221,12 @@ float WS_DROP			= 2; // deselecting frame
 float WS_INUSE			= 3; // fire state
 float WS_READY			= 4; // idle frame
 
+// there is 2 weapon tics that can run in one server frame
+#define W_TICSPERFRAME 2
+
 void weapon_defaultspawnfunc(float wpn);
 
 string w_deathtypestring;
-float w_deathtype;
 
 void(entity client, string s) centerprint_builtin = #73;
 .vector dest1, dest2;
@@ -325,6 +327,8 @@ float sv_loddistance2;
 .float cvar_cl_gunalign;
 .float cvar_cl_noantilag;
 
+.string weaponorder_byimpulse;
+
 void Announce(string snd);
 void AnnounceTo(entity e, string snd);
 
@@ -436,6 +440,7 @@ float next_pingtime;
 // TODO implemented fall and falling
 #define ALLPLAYERSOUNDS \
 		_VOICEMSG(death) \
+		_VOICEMSG(fall) \
 		_VOICEMSG(drown) \
 		_VOICEMSG(gasp) \
 		_VOICEMSG(jump) \
@@ -643,5 +648,8 @@ string deathmessage;
 #define ACTIVE_TOGGLE	3
 .float active;
 .float (float act_state) setactive;
-=======
 .entity realowner;
+
+.float nex_charge;
+
+float allowed_to_spawn; // boolean variable used by the clan arena code to determine if a player can spawn (after the round has ended)