From: Mario <mario@smbclan.net>
Date: Wed, 19 Oct 2016 21:21:39 +0000 (+1000)
Subject: Allow setting a monster to not auto align itself at spawn
X-Git-Tag: xonotic-v0.8.2~493
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d7c9f0d5052bc970e342b1dcd102afb05f6b9b1d;p=xonotic%2Fxonotic-data.pk3dir.git

Allow setting a monster to not auto align itself at spawn
---

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index 59c57fbbe..f680f118b 100644
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -1346,13 +1346,13 @@ bool Monster_Spawn(entity this, bool check_appear, int mon_id)
 	this.oldtarget2			= this.target2;
 	this.pass_distance		= 0;
 	this.deadflag			= DEAD_NO;
-	this.noalign			= ((mon.spawnflags & MONSTER_TYPE_FLY) || (mon.spawnflags & MONSTER_TYPE_SWIM));
 	this.spawn_time			= time;
 	this.gravity			= 1;
 	this.monster_moveto		= '0 0 0';
 	this.monster_face 		= '0 0 0';
 	this.dphitcontentsmask	= DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_BOTCLIP | DPCONTENTS_MONSTERCLIP;
 
+	if(!this.noalign) { this.noalign = ((mon.spawnflags & MONSTER_TYPE_FLY) || (mon.spawnflags & MONSTER_TYPE_SWIM)); }
 	if(!this.scale) { this.scale = 1; }
 	if(autocvar_g_monsters_edit) { this.grab = 1; }
 	if(autocvar_g_fullbrightplayers) { this.effects |= EF_FULLBRIGHT; }