]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Prevent "Begin!" announcement & centreprint when returning to warmup
authorbones_was_here <bones_was_here@xonotic.au>
Mon, 26 Sep 2022 05:23:02 +0000 (15:23 +1000)
committerbones_was_here <bones_was_here@xonotic.au>
Wed, 28 Sep 2022 20:00:45 +0000 (06:00 +1000)
Applicable to ReadyRestart() / qc_cmd_sv resetmatch,
switching from unlimited to timed warmup (g_warmup -1),
and countdown abort (g_warmup -1).

qcsrc/client/announcer.qc

index e15bc23b7e23c62251f9af84547d070bb3accc5a..780b582dea10d0c33ca40f1fe593071f33e28115 100644 (file)
@@ -130,7 +130,7 @@ void Announcer_Gamestart()
        float roundstarttime = STAT(ROUNDSTARTTIME);
        if(roundstarttime > startTime)
                startTime = roundstarttime;
-       if(intermission)
+       if(intermission || warmup_stage)
        {
                Announcer_ClearTitle();
                if(announcer_countdown)