Merge branch 'Mario/reset_clear_item_waypoints' 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..d82469c11ef1ca7573752897113a614c673e01f3 100644 (file)
--- a/qcsrc/server/world.qh
+++ b/qcsrc/server/world.qh
@@ -114,7 +114,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;