Merge branch 'master' into terencehill/ca_arena_mutators

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

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index bfea6b2bcb39f681c8d6110d81db1d90b0399f70..80bf9a1c4a50a809f4dc7d41b2a008a551ee77b2 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -457,8 +457,10 @@ string cvar_changes;
 string cvar_purechanges;
 float cvar_purechanges_count;
 
 string cvar_purechanges;
 float cvar_purechanges_count;
 

-float game_starttime; //point in time when the countdown is over
+float game_starttime; //point in time when the countdown to game start is over
+float round_starttime; //point in time when the countdown to round start is over

 .float stat_game_starttime;
 .float stat_game_starttime;

+.float stat_round_starttime;

 
 .float stat_sv_airaccel_qw;
 .float stat_sv_airstrafeaccel_qw;
 
 .float stat_sv_airaccel_qw;
 .float stat_sv_airstrafeaccel_qw;


@@ -590,8 +592,6 @@ string deathmessage;
 
 .float hagar_load;
 
 
 .float hagar_load;
 

-float allowed_to_spawn; // boolean variable used by the clan arena code to determine if a player can spawn (after the round has ended)
-

 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 serverflags;
 
 .float team_forced; // can be a team number to force a team, or 0 for default action, or -1 for forced spectator


@@ -599,7 +599,6 @@ float serverflags;
 .float player_blocked;
 
 .float freezetag_frozen;
 .float player_blocked;
 
 .float freezetag_frozen;

-.float freezetag_revive_progress;

 
 .entity muzzle_flash;
 .float misc_bulletcounter;     // replaces uzi & hlac bullet counter.
 
 .entity muzzle_flash;
 .float misc_bulletcounter;     // replaces uzi & hlac bullet counter.