X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;h=7ba19dafd5fcfe61489e3124f388869579877c38;hb=791f5e8ceaa56c6b14a8de7ab573292177cfd312;hp=b510b43c8076b0b81c606e44ca3e6f00b076eb95;hpb=7f042267d93f57719b68f0725af14d444f5c8932;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc index b510b43c8..7ba19dafd 100644 --- a/qcsrc/server/sv_main.qc +++ b/qcsrc/server/sv_main.qc @@ -160,8 +160,7 @@ Called before each frame by the server ============= */ -float game_delay; -float game_delay_last; +bool game_delay_last; bool autocvar_sv_autopause = false; float RedirectionThink(); @@ -220,17 +219,15 @@ void StartFrame() skill = autocvar_skill; // detect when the pre-game countdown (if any) has ended and the game has started - game_delay = (time < game_starttime); - + bool game_delay = (time < game_starttime); if (autocvar_sv_eventlog && game_delay_last && !game_delay) GameLogEcho(":startdelay_ended"); - game_delay_last = game_delay; CreatureFrame_All(); CheckRules_World(); - if (warmup_stage && !gameover && warmup_limit > 0 && time >= warmup_limit) { + if (warmup_stage && !game_stopped && warmup_limit > 0 && time >= warmup_limit) { ReadyRestart(); return; }