From 80a89e0adc83ac71acd21be5939e82e2b10bd233 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 16 Apr 2013 15:50:55 +1000 Subject: [PATCH] Remove extra flag for respawning --- qcsrc/server/monsters/lib/defs.qh | 5 ++--- qcsrc/server/monsters/lib/monsters.qc | 2 +- qcsrc/server/monsters/monster/zombie.qc | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/qcsrc/server/monsters/lib/defs.qh b/qcsrc/server/monsters/lib/defs.qh index 9acf68d74..f694192c4 100644 --- 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 2d9f04b1f..453cef936 100644 --- 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 ffd910184..1770cbd80 100644 --- 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); -- 2.39.2