Merge branch 'savagex/plat-movehack'

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

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index bbd554f5e375697c29dace35b7ab1abcf79fd3d7..d6b33dc67dc339a00fbb409a497b76a066a5d8a9 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -77,6 +77,7 @@ float maxclients;
 //.float       style;
 //.float       skill;
 .float sounds;
+.float  platmovetype;
 
 .string killtarget;
 
@@ -267,7 +268,7 @@ void checkSpectatorBlock();
 .float jointime; // time of joining
 .float alivetime; // time of being alive
 
-float isJoinAllowed();
+float nJoinAllowed(float includeMe);
 #define PREVENT_JOIN_TEXT "^1You may not join the game at this time.\n\nThe player limit reached maximum capacity."
 
 //sv_timeout: pauses the game by setting the gamespeed to a really low value (see TIMEOUT_SLOWMO_VALUE)
@@ -613,6 +614,7 @@ float client_cefc_accumulatortime;
 #endif
 
 .float sniperrifle_bulletcounter;
+.float wish_reload;
 
 #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_CORPSE; (e).dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE
 // when doing this, hagar can go through clones
@@ -658,7 +660,6 @@ float serverflags;
 .float team_forced; // can be a team number to force a team, or 0 for default action, or -1 for forced spectator
 
 .float freezetag_frozen;
-.float freezetag_beginrevive_time;
 .float freezetag_revive_progress;
 
 .entity muzzle_flash;