Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Fri, 19 May 2017 21:25:15 +0000 (23:25 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 19 May 2017 21:25:15 +0000 (23:25 +0200)
1  2 
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();