Remove extra flag for respawning

diff --git a/qcsrc/server/monsters/lib/defs.qh b/qcsrc/server/monsters/lib/defs.qh
index 9acf68d740133550dbfd2786267d467c56f06ba3..f694192c483fc04b43cb6cd4251ef1cf902f1582 100644 (file)
--- a/qcsrc/server/monsters/lib/defs.qh
+++ b/qcsrc/server/monsters/lib/defs.qh
@@ -6,9 +6,8 @@
 
 .string oldtarget2;
 
-.float respawnflags;
-const float MONSTER_RESPAWN_SPAWNPOINT = 0; // re-spawn at original spawn point
-const float MONSTER_RESPAWN_DEATHPOINT = 1; // re-spawn where we died
+const float MONSTER_RESPAWN_SPAWNPOINT = 10; // re-spawn at original spawn point
+const float MONSTER_RESPAWN_DEATHPOINT = 11; // re-spawn where we died
 
 .float monster_respawned; // used to make sure we're not recounting respawned monster stats
 

diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc
index 2d9f04b1f2e2925601c57266d4c2b21a33d58aa3..453cef936f1a3fec8e5a77de659d9c0dc2b98efe 100644 (file)
--- a/qcsrc/server/monsters/lib/monsters.qc
+++ b/qcsrc/server/monsters/lib/monsters.qc
@@ -295,7 +295,7 @@ void Monster_Fade ()
                self.monster_respawned = TRUE;
                self.think = self.monster_spawnfunc;
                self.nextthink = time + self.respawntime;
-               if(self.respawnflags & MONSTER_RESPAWN_DEATHPOINT)
+               if(self.spawnflags & MONSTER_RESPAWN_DEATHPOINT)
                {
                        self.pos1 = self.origin;
                        self.pos2 = self.angles;

diff --git a/qcsrc/server/monsters/monster/zombie.qc b/qcsrc/server/monsters/monster/zombie.qc
index ffd910184e57e9a8d39ad13853c1332ae4fe37c7..1770cbd80bdb2048c7055628b69f6598ea0cc663 100644 (file)
--- a/qcsrc/server/monsters/monster/zombie.qc
+++ b/qcsrc/server/monsters/monster/zombie.qc
@@ -134,7 +134,7 @@ void zombie_spawn()
        self.attack_melee               = zombie_attack_standing;
        self.attack_ranged              = zombie_attack_ranged;
        self.respawntime                = 0.1;
-       self.respawnflags               = MONSTER_RESPAWN_DEATHPOINT;
+       self.spawnflags            |= MONSTER_RESPAWN_DEATHPOINT; // always enabled for zombie
        
        monsters_setframe(zombie_anim_spawn);