Skip to content

Fix "prepare for battle" playing twice on round-based modes

z411 requested to merge z411/double_announcer_fix into master

ANNCE_PREPARE (Prepare for battle announcer) would play twice on round-based modes because STAT(ROUNDSTARTTIME) is set a few ticks after STAT(GAMESTARTTIME) is set, thus the client would attempt to create the announcer countdown entity TWICE when using sv_ready_restart_after_countdown 1. This is probably a very old bug that we never noticed until !1075 (merged) got implemented.

How to reproduce bug:

  1. Set g_warmup 1
  2. Set sv_ready_restart_after_countdown 1
  3. Start a match

This should fix it, but I would appreciate it if you could check if it doesn't break other gamemodes (I tried DM, TDM, CA, warmup on and off, g_start_delay on and off).

I also cleaned up some code that was calling Announcer_ClearTitle() every frame.

Edited by z411

Merge request reports