From: terencehill <piuntn@gmail.com>
Date: Sat, 15 Jul 2017 09:44:46 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/bot_waypoints
X-Git-Tag: xonotic-v0.8.5~2378^2~128
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=583ff2fd202086e9cccd53071a5b88371b8d9dd1;hp=-c

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

583ff2fd202086e9cccd53071a5b88371b8d9dd1
diff --combined qcsrc/server/sv_main.qc
index 5633a06b55,0ae9b356cd..cd316175be
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@@ -216,6 -216,8 +216,6 @@@ 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
  	bool game_delay = (time < game_starttime);
  	if (autocvar_sv_eventlog && game_delay_last && !game_delay)
@@@ -376,6 -378,9 +376,9 @@@ LABEL(cvar_fail
  
  	set_movetype(this, this.movetype);
  
+ 	if(this.monster_attack)
+ 		IL_PUSH(g_monster_targets, this);
+ 
  	// support special -1 and -2 angle from radiant
  	if (this.angles == '0 -1 0')
  		this.angles = '-90 0 0';