From: Mario <mario@smbclan.net>
Date: Sat, 22 Oct 2016 17:48:51 +0000 (+1000)
Subject: Merge branch 'master' into Mario/intrusive_2
X-Git-Tag: xonotic-v0.8.2~474^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8c965aa90470cfa8cbfaff88db71b6b5899a90ce;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/intrusive_2
---

8c965aa90470cfa8cbfaff88db71b6b5899a90ce
diff --cc qcsrc/common/monsters/sv_monsters.qc
index 69543a745,f680f118b..72e79d58a
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@@ -1300,12 -1296,9 +1296,12 @@@ bool Monster_Spawn(entity this, bool ch
  	if(!autocvar_g_monsters) { Monster_Remove(this); return false; }
  
  	if(!(this.spawnflags & MONSTERFLAG_RESPAWNED))
 +	{
  		IL_PUSH(g_monsters, this);
 +		IL_PUSH(g_damagedbycontents, this);
 +	}
  
- 	if(Monster_Appear_Check(this, mon_id)) { return true; } // return true so the monster isn't removed
+ 	if(check_appear && Monster_Appear_Check(this, mon_id)) { return true; } // return true so the monster isn't removed
  
  	if(!this.monster_skill)
  		this.monster_skill = cvar("g_monsters_skill");