Clean up monster_use function a little

diff --git a/qcsrc/common/monsters/cl_monsters.qc b/qcsrc/common/monsters/cl_monsters.qc
index 0171de2201565e97952c16c85e052109e8eb64d9..7b38e78d35905370471f73a624d75cc3fac85f37 100644 (file)
--- a/qcsrc/common/monsters/cl_monsters.qc
+++ b/qcsrc/common/monsters/cl_monsters.qc
@@ -212,7 +212,6 @@ void monster_construct()
        self.draw                       = monster_draw;
        self.draw2d                     = monster_draw2d;
        self.maxdistance        = autocvar_g_waypointsprite_monsters_maxdist;
-       self.teamradar_color = '1 0 0';
 }
 
 void ent_monster()

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index d3572a076e7a7a02937db2684c88079d25e0920e..4336fc19bef284ad51adf0b7470ae000efb7ac5c 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -373,15 +373,10 @@ void monster_checkattack(entity e, entity targ)
 
 void monster_use ()
 {
-       if (self.enemy)
-               return;
-       if (self.health <= 0)
-               return;
-
-       if(!monster_isvalidtarget(activator, self))
-               return;
-
-       self.enemy = activator;
+       if not(self.enemy)
+       if(self.health > 0)
+       if(monster_isvalidtarget(activator, self))
+               self.enemy = activator;
 }
 
 .float last_trace;