Merge branch 'master' into terencehill/replicatevars_enhancements

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

diff --git a/qcsrc/server/world.qh b/qcsrc/server/world.qh
index 4141c99e29182a49daff6c1678b52dadad704c3d..299c88535446724e3819fc5f90c67ac07efe0693 100644 (file)
--- a/qcsrc/server/world.qh
+++ b/qcsrc/server/world.qh
@@ -35,6 +35,8 @@ float checkrules_overtimesadded; //how many overtimes have been already added
 // flag set on worldspawn so that the code knows if it is dedicated or not
 bool server_is_dedicated;
 
+int world_initialized;
+
 string cvar_changes;
 string cvar_purechanges;
 float cvar_purechanges_count;
@@ -43,6 +45,12 @@ string modname;
 
 string gamemode_name;
 
+string record_type;
+
+string autocvar_sv_termsofservice_url;
+// only escape the terms of service url on map change
+string sv_termsofservice_url_escaped;
+
 string clientstuff;
 
 string matchid;
@@ -130,7 +138,7 @@ const int WINNING_STARTSUDDENDEATHOVERTIME = 3; // no winner, enter suddendeath
 
 float WinningCondition_Scores(float limit, float leadlimit);
 void SetWinners(.float field, float value);
-void ReadyRestart();
+void ReadyRestart(bool forceWarmupEnd);
 
 void DumpStats(float final);