From: terencehill <piuntn@gmail.com>
Date: Fri, 19 May 2017 21:25:15 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/bot_waypoints
X-Git-Tag: xonotic-v0.8.5~2378^2~156
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e1ffca1bb185fb2dc57c8e1ed043ef09e578863c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/bot_waypoints
---

e1ffca1bb185fb2dc57c8e1ed043ef09e578863c
diff --cc qcsrc/server/sv_main.qc
index cf56e23ba,7ba19dafd..5633a06b5
--- a/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();