Merge branch 'master' into terencehill/scoreboard_ui

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

diff --git a/qcsrc/server/world.qh b/qcsrc/server/world.qh
index 7448c0847ed3dc710ff34691e5612c5abe34cc75..242b3369470546ff8c0a1c4b0169e14605237044 100644 (file)
--- a/qcsrc/server/world.qh
+++ b/qcsrc/server/world.qh
@@ -2,14 +2,42 @@
 
 #include <common/weapons/_all.qh>
 
+bool autocvar__sv_init;
+bool autocvar__endmatch;
+bool autocvar_g_use_ammunition;
+bool autocvar_g_jetpack;
+bool autocvar_g_warmup_allguns;
+bool autocvar_g_warmup_allow_timeout;
+#define autocvar_g_weaponarena cvar_string("g_weaponarena")
+string autocvar_quit_and_redirect;
+float autocvar_quit_and_redirect_timer;
+bool autocvar_quit_when_empty;
+string autocvar_sessionid;
+bool autocvar_sv_curl_serverpackages_auto;
+bool autocvar_sv_db_saveasdump;
+bool autocvar_sv_logscores_bots;
+bool autocvar_sv_logscores_console;
+bool autocvar_sv_logscores_file;
+string autocvar_sv_logscores_filename;
+float autocvar_sv_mapchange_delay;
+float autocvar_timelimit_increment;
+float autocvar_timelimit_decrement;
+float autocvar_timelimit_min;
+float autocvar_timelimit_max;
+float autocvar_timelimit_overtime;
+int autocvar_timelimit_overtimes;
+float autocvar_timelimit_suddendeath;
+
 float checkrules_equality;
 float checkrules_suddendeathwarning;
 float checkrules_suddendeathend;
-float checkrules_overtimesadded; //how many overtimes have been already added
+int 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;
@@ -18,6 +46,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;
@@ -105,7 +139,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);