X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_world.qc;h=24c81a27666d7bad59504c9070ca74f9c6a40ce8;hp=99411e0bb24792025366256a0444afef8175c80a;hb=252f4ca05841fb1d01caa95e266fd8fe1db68c58;hpb=2b67ae817f499cefc1778834117ce3f7b56cbdd9

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 99411e0bb2..24c81a2766 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -733,6 +733,9 @@ spawnfunc(worldspawn)
 	if(!limits_are_set)
 		SetLimits(autocvar_fraglimit_override, autocvar_leadlimit_override, autocvar_timelimit_override, -1);
 
+	if(warmup_limit == 0)
+		warmup_limit = (autocvar_timelimit > 0) ? autocvar_timelimit * 60 : autocvar_timelimit;
+
 	player_count = 0;
 	bot_waypoints_for_items = autocvar_g_waypoints_for_items;
 	if(bot_waypoints_for_items == 1)