Merge branch 'master' into samual/weapons

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / monsters / sv_monsters.qc

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index 038ffb58c67845861722b165bbeb668380c7741d..013eea7436b122149ed78db98f0fff22d6bbc93a 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -337,7 +337,7 @@ void Monster_CheckMinibossFlag ()
                self.health += autocvar_g_monsters_miniboss_healthboost;
                self.effects |= EF_RED;
                if(!self.weapon)
-                       self.weapon = WEP_NEX;
+                       self.weapon = WEP_VORTEX;
        }
 }
 
@@ -384,8 +384,7 @@ void Monster_Fade ()
                totalspawned -= 1;
 
                if(IS_CLIENT(self.realowner))
-               if(!(self.spawnflags & MONSTERFLAG_RESPAWNED))
-                               self.realowner.monstercount -= 1;
+                       self.realowner.monstercount -= 1;
 
                SUB_SetFade(self, time + 3, 1);
        }
@@ -781,8 +780,10 @@ void monsters_corpse_damage (entity inflictor, entity attacker, float damage, fl
        {
                Violence_GibSplash_At(hitloc, force, 2, bound(0, damage, 200) / 16, self, attacker);
 
+               // number of monsters spawned with mobspawn command
+               totalspawned -= 1;
+
                if(IS_CLIENT(self.realowner))
-               if(!(self.spawnflags & MONSTERFLAG_RESPAWNED))
                        self.realowner.monstercount -= 1;
 
                self.think = SUB_Remove;
@@ -807,13 +808,12 @@ void monster_die(entity attacker, float gibbed)
        if(autocvar_g_monsters_score_spawned || !((self.spawnflags & MONSTERFLAG_SPAWNED) || (self.spawnflags & MONSTERFLAG_RESPAWNED)))
                PlayerScore_Add(attacker, SP_SCORE, +autocvar_g_monsters_score_kill);
 
-       if(!Monster_CanRespawn(self) && gibbed)
+       if(gibbed)
        {
                // number of monsters spawned with mobspawn command
                totalspawned -= 1;
 
                if(IS_CLIENT(self.realowner))
-               if(!(self.spawnflags & MONSTERFLAG_RESPAWNED))
                        self.realowner.monstercount -= 1;
        }