]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Don't face owner if the monster has an enemy
authorMario <mario.mario@y7mail.com>
Tue, 5 Mar 2013 18:24:00 +0000 (05:24 +1100)
committerMario <mario.mario@y7mail.com>
Tue, 5 Mar 2013 18:24:00 +0000 (05:24 +1100)
qcsrc/server/monsters/lib/monsters.qc

index 3b01e68d20c3afd873a89e156532b52f7009022f..5bb995f577cddb89b7b68535b53871f4ae35288e 100644 (file)
@@ -557,6 +557,7 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_
        
        vector angles_face = vectoangles(self.moveto - self.origin);
        vector owner_face = vectoangles(self.monster_owner.origin - self.origin);
+       vector enemy_face = vectoangles(self.enemy.origin - self.origin);
        self.angles_y = angles_face_y;
        
        if(self.state == MONSTER_STATE_ATTACK_LEAP && (self.flags & FL_ONGROUND))
@@ -593,7 +594,10 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_
                if (vlen(self.velocity) <= 30)
                {
                        self.frame = manim_idle;
-                       self.angles_y = ((self.monster_owner) ? owner_face_y : self.pos2_y); // reset looking angle now?
+                       if(self.enemy)
+                               self.angles_y = enemy_face_y;
+                       else
+                               self.angles_y = ((self.monster_owner) ? owner_face_y : self.pos2_y); // reset looking angle now?
                }
        }