Merge branch 'terencehill/bot_ai' into 'master'

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

diff --git a/qcsrc/server/world.qh b/qcsrc/server/world.qh
index e74ab2dc7589733b4ca9e4034ab587c49daa78d1..48c0e38d4966bc0232567f2b1f3b3ed6bf766775 100644 (file)
--- a/qcsrc/server/world.qh
+++ b/qcsrc/server/world.qh
@@ -27,6 +27,7 @@ float autocvar_timelimit_max;
 float autocvar_timelimit_overtime;
 int autocvar_timelimit_overtimes;
 float autocvar_timelimit_suddendeath;
+bool autocvar_sv_gameplayfix_droptofloorstartsolid;
 
 float checkrules_equality;
 float checkrules_suddendeathwarning;
@@ -114,7 +115,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 +151,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();