Merge branch 'master' into z411/bai-server

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

diff --git a/qcsrc/server/world.qh b/qcsrc/server/world.qh
index 271f394adaa91c84f801a48db1856032781ca485..dd0b18134c96bd09602273a6dc819432467f4c40 100644 (file)
--- a/qcsrc/server/world.qh
+++ b/qcsrc/server/world.qh
@@ -6,6 +6,7 @@ bool autocvar__sv_init;
 bool autocvar__endmatch;
 bool autocvar_g_use_ammunition;
 bool autocvar_g_jetpack;
+int autocvar_g_warmup;
 bool autocvar_g_warmup_allguns;
 bool autocvar_g_warmup_allow_timeout;
 #define autocvar_g_weaponarena cvar_string("g_weaponarena")
@@ -27,8 +28,16 @@ float autocvar_timelimit_max;
 float autocvar_timelimit_overtime;
 int autocvar_timelimit_overtimes;
 float autocvar_timelimit_suddendeath;
-bool autocvar_sv_gameplayfix_droptofloorstartsolid;
-bool autocvar_sv_gameplayfix_droptofloorstartsolid_nudgetocorrect;
+
+// z411
+bool autocvar_sv_jingle_end;
+string autocvar_sv_jingle_end_list;
+float autocvar_sv_jingle_end_volume;
+
+float fragsleft;
+int fragsleft_last;
+bool autocvar_sv_mapformat_is_quake3;
+bool autocvar_sv_mapformat_is_quake2;
 
 float checkrules_equality;
 float checkrules_suddendeathwarning;
@@ -46,7 +55,8 @@ float cvar_purechanges_count;
 
 string modname;
 
-string gamemode_name;
+string autocvar__sv_vote_gametype_custom;
+string gametype_custom_string;
 
 string record_type;
 
@@ -163,6 +173,13 @@ void readlevelcvars();
 .vector dropped_origin;
 void droptofloor(entity this);
 
+/* z411 for RJZ */
+bool autocvar_rjz_count_shards = false;
+bool autocvar_rjz_ranks = false;
+int  total_shards = 0;
+void send_TotalShards(entity to);
+void send_TotalShardsAll();
+
 IntrusiveList g_moveables;
 STATIC_INIT(g_moveables) { g_moveables = IL_NEW(); }