From: Mario Date: Mon, 2 Sep 2013 00:39:33 +0000 (+1000) Subject: Fix monsters always using infront X-Git-Tag: xonotic-v0.8.0~241^2^2~96 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1412e4378ab996a543261e72cbe57c209806e13c;p=xonotic%2Fxonotic-data.pk3dir.git Fix monsters always using infront --- diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc index 3591fe80b..ad35f4db5 100644 --- a/qcsrc/common/monsters/sv_monsters.qc +++ b/qcsrc/common/monsters/sv_monsters.qc @@ -486,8 +486,7 @@ vector monster_pickmovetarget(entity targ) { self.monster_movestate = MONSTER_MOVE_OWNER; self.last_trace = time + 0.3; - if(self.monster_owner) - return self.monster_owner.origin; + return (self.monster_owner) ? self.monster_owner.origin : self.origin; } case MONSTER_MOVE_SPAWNLOC: { diff --git a/qcsrc/common/monsters/sv_monsters.qh b/qcsrc/common/monsters/sv_monsters.qh index 1f210235f..e929defe8 100644 --- a/qcsrc/common/monsters/sv_monsters.qh +++ b/qcsrc/common/monsters/sv_monsters.qh @@ -59,7 +59,7 @@ const float MONSTERSKILL_NOTHARD = 1024; // monster will not spawn on skill >= 3 const float MONSTERFLAG_APPEAR = 2; // delay spawn until triggered const float MONSTERFLAG_NORESPAWN = 4; const float MONSTERFLAG_FLY_VERTICAL = 8; // fly/swim vertically -const float MONSTERFLAG_INFRONT = 16; // only check for enemies infront of us +const float MONSTERFLAG_INFRONT = 32; // only check for enemies infront of us const float MONSTERFLAG_MINIBOSS = 64; // monster spawns as mini-boss (also has a chance of naturally becoming one) const float MONSTERFLAG_SPAWNED = 16384; // flag for spawned monsters