From: Mario <mario.mario@y7mail.com>
Date: Mon, 18 Nov 2019 10:12:08 +0000 (+1000)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.5~7^2~1^2~23
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=17d9558bff4fa8c1d7f558897b7830cb0cf4dca6;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/monsters

# Conflicts:
#	qcsrc/common/monsters/monster/shambler.qc
#	qcsrc/common/monsters/monster/wyvern.qc
#	qcsrc/common/monsters/sv_monsters.qc
---

17d9558bff4fa8c1d7f558897b7830cb0cf4dca6
diff --cc qcsrc/common/monsters/sv_monsters.qc
index 990f31887,4f2139cc1..319b699a7
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@@ -213,8 -189,11 +213,12 @@@ void monster_changeteam(entity this, in
  .void(entity) monster_delayedfunc;
  void Monster_Delay_Action(entity this)
  {
 -	if(Monster_ValidTarget(this.owner, this.owner.enemy))
 +	// TODO: maybe do check for facing here
- 	if(Monster_ValidTarget(this.owner, this.owner.enemy, false)) { this.monster_delayedfunc(this.owner); }
++	if(Monster_ValidTarget(this.owner, this.owner.enemy, false))
+ 	{
+ 		monster_makevectors(this.owner, this.owner.enemy);
+ 		this.monster_delayedfunc(this.owner);
+ 	}
  
  	if(this.cnt > 1)
  	{