X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fworld.qh;h=ff799e64cc529d7d406aebd5d929d12cb25b4766;hb=ee6a8d98fd285c5625e938984daa6fe2fd949d96;hp=e74ab2dc7589733b4ca9e4034ab587c49daa78d1;hpb=885c7f4d3ed9a1c0ded2fab0b289120dfda75ba5;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/world.qh b/qcsrc/server/world.qh
index e74ab2dc7..ff799e64c 100644
--- 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,6 +28,11 @@ 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;
+
+bool autocvar_sv_mapformat_is_quake3;
+bool autocvar_sv_mapformat_is_quake2;
 
 float checkrules_equality;
 float checkrules_suddendeathwarning;
@@ -114,7 +120,7 @@ float g_weapon_stay;
 float want_weapon(entity weaponinfo, float allguns); // WEAPONTODO: what still needs done?
 
 float g_grappling_hook;
-float warmup_stage;
+int warmup_stage;
 
 bool sv_ready_restart_after_countdown;
 
@@ -150,6 +156,10 @@ float MoveToRandomMapLocation(entity e, float goodcontents, float badcontents, f
 void CheckRules_World();
 float RedirectionThink();
 
+// quake 3 music compatibility
+.string music;
+.string noise;
+
 void readplayerstartcvars();
 
 void readlevelcvars();
@@ -159,3 +169,5 @@ void droptofloor(entity this);
 
 IntrusiveList g_moveables;
 STATIC_INIT(g_moveables) { g_moveables = IL_NEW(); }
+
+bool observe_blocked_if_eliminated = false; // forbids eliminated players from observing