Merge branch 'master' into terencehill/bot_waypoints

diff --cc qcsrc/server/sv_main.qc
index cf56e23bafb68582b46cf0b88b7b6bc3ed128448,7ba19dafd5fcfe61489e3124f388869579877c38..5633a06b550d7aafc21cded419a04aa8fd3e7cd0
--- 1/qcsrc/server/sv_main.qc
--- 2/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@@ -217,12 -216,12 +216,10 @@@ void StartFrame(
        if (timeout_status == TIMEOUT_LEADTIME) // just before the timeout (when timeout_status will be TIMEOUT_ACTIVE)
                orig_slowmo = autocvar_slowmo; // slowmo will be restored after the timeout
  
 -      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();