Clean up netname strzoning a little

diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc
index c644252f5b847052da220dfcdc003ecbe34559d4..e89f3e9ab579fe437940e2310343b423aecb950c 100644 (file)
--- a/qcsrc/server/monsters/lib/monsters.qc
+++ b/qcsrc/server/monsters/lib/monsters.qc
@@ -896,8 +896,6 @@ void monster_hook_spawn()
 {
        if not(self.monster_respawned)
                Monster_CheckMinibossFlag();
-               
-       string nname = strzone(strdecolorize(self.netname));
 
        self.max_health = self.health;
        self.pain_finished = self.nextthink;
@@ -910,7 +908,7 @@ void monster_hook_spawn()
                
        if(autocvar_g_monsters_healthbars)
        {
-               WaypointSprite_Spawn(nname, 0, 600, self, '0 0 1' * (self.maxs_z + 15), world, 0, self, sprite, FALSE, RADARICON_DANGER, ((self.team) ? Team_ColorRGB(self.team) : '1 0 0'));   
+               WaypointSprite_Spawn(self.netname, 0, 600, self, '0 0 1' * (self.maxs_z + 15), world, 0, self, sprite, FALSE, RADARICON_DANGER, ((self.team) ? Team_ColorRGB(self.team) : '1 0 0'));    
                WaypointSprite_UpdateMaxHealth(self.sprite, self.max_health);
                WaypointSprite_UpdateHealth(self.sprite, self.health);
        }
@@ -940,11 +938,7 @@ float monster_initialize(string  net_name, float mon_id,
        if(monster_skill >= autocvar_g_monsters_skill_nightmare && (self.spawnflags & MONSTERSKILL_NOTNIGHTMARE)) { return FALSE; }
 
        if(self.netname == "")
-       {
-               if(net_name != "" && IS_PLAYER(self.realowner))
-                       net_name = strzone(sprintf("%s^7's %s", self.realowner.netname, net_name));
-               self.netname = ((net_name == "") ? self.classname : net_name);
-       }
+               self.netname = strzone((net_name == "") ? self.classname : net_name);
        
        if(autocvar_g_monsters_giants_only)
                self.spawnflags |= MONSTERFLAG_GIANT;