X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmonsters%2Fsv_monsters.qc;h=013eea7436b122149ed78db98f0fff22d6bbc93a;hb=b38e2bae0a50554f26bf5af1fbd0e70b97cc0c71;hp=038ffb58c67845861722b165bbeb668380c7741d;hpb=29b8ca3d2b3f1417baaa2c830f628cc0b9ee0022;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index 038ffb58c..013eea743 100644
--- 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;
 	}