Remove a useless global check

diff --git a/qcsrc/common/monsters/spawn.qc b/qcsrc/common/monsters/spawn.qc
index 95e0261aeb511687fe40ae57497945b2a10eaff8..e8dfdd58f951c85af22751e00cbd8361e25e5778 100644 (file)
--- a/qcsrc/common/monsters/spawn.qc
+++ b/qcsrc/common/monsters/spawn.qc
@@ -1,10 +1,7 @@
 entity spawnmonster (string monster, float mnster, entity spawnedby, entity own, vector orig, float respwn, float moveflag)
 {
-       if(!spawncode_first_load)
-       {
-               initialize_field_db();
-               spawncode_first_load = TRUE;
-       }
+       // ensure spawnfunc database is initialized
+       initialize_field_db();
        
        entity e = spawn();
        

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index ff18c1addfac79f8fa8827d0c87d5510bfd20529..df30e5346876ea75e21f3b3df3c23d583bf09812 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -281,7 +281,7 @@ void Monster_Fade ()
                self.takedamage = DAMAGE_NO;
                setorigin(self, self.pos1);
                self.angles = self.pos2;
-               self.health = self.max_health; // TODO: check if resetting to max_health is wise here
+               self.health = self.max_health;
                
                self.SendFlags |= MSF_MOVE;
                self.SendFlags |= MSF_STATUS;
@@ -863,12 +863,10 @@ void monsters_damage (entity inflictor, entity attacker, float damage, float dea
        }
                
        if(self.health <= 0)
-       {        
+       {
+               // Update one more time to avoid waypoint fading without emptying healthbar
                if(self.sprite)
-               {
-                       // Update one more time to avoid waypoint fading without emptying healthbar
                        WaypointSprite_UpdateHealth(self.sprite, 0);
-               }
                
                if(deathtype == DEATH_KILL)
                        self.candrop = FALSE; // killed by mobkill command

diff --git a/qcsrc/common/monsters/sv_monsters.qh b/qcsrc/common/monsters/sv_monsters.qh
index 0ceb95852aab624a7b27d564b6fe6cd07a455807..f27ce0072ff45e0030755f035f6b3b07c73f72ef 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qh
+++ b/qcsrc/common/monsters/sv_monsters.qh
@@ -2,7 +2,6 @@
 .float monster_attack;
 
 float monster_skill;
-float spawncode_first_load; // used to tell the player the monster database is loading (TODO: fix this?)
 
 .entity monster_owner; // new monster owner entity, fixes non-solid monsters
 .float monstercount; // per player monster count