From: Mario <mario.mario@y7mail.com>
Date: Sat, 31 Aug 2013 19:50:13 +0000 (+1000)
Subject: Clean up monster_use function a little
X-Git-Tag: xonotic-v0.8.0~241^2^2~116
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=825bbad5c854f620b8c182761a0547dfa7346e67;p=xonotic%2Fxonotic-data.pk3dir.git

Clean up monster_use function a little
---

diff --git a/qcsrc/common/monsters/cl_monsters.qc b/qcsrc/common/monsters/cl_monsters.qc
index 0171de220..7b38e78d3 100644
--- 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 d3572a076..4336fc19b 100644
--- 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;