From: Mario <mario.mario@y7mail.com>
Date: Sun, 1 Sep 2013 16:53:45 +0000 (+1000)
Subject: Remove extra useless turret hooks
X-Git-Tag: xonotic-v0.8.0~241^2^2~110
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4c6fedb2cb6f6ab736c36b6fbe6bdaac42e4b7cf;p=xonotic%2Fxonotic-data.pk3dir.git

Remove extra useless turret hooks
---

diff --git a/qcsrc/server/mutators/base.qh b/qcsrc/server/mutators/base.qh
index 8409a4be5..bd70e7cce 100644
--- a/qcsrc/server/mutators/base.qh
+++ b/qcsrc/server/mutators/base.qh
@@ -128,16 +128,6 @@ MUTATOR_HOOKABLE(TurretSpawn);
 	// return error to request removal
 	// INPUT: self - turret
 	
-MUTATOR_HOOKABLE(TurretDies);
-	// called when a turret dies
-	
-MUTATOR_HOOKABLE(TurretValidateTarget);
-	// return target score
-	// INPUT:
-		entity turret_target;
-		entity turret;
-		float turret_flags;
-	
 MUTATOR_HOOKABLE(OnEntityPreSpawn);
 	// return error to prevent entity spawn, or modify the entity
 
diff --git a/qcsrc/server/tturrets/system/system_damage.qc b/qcsrc/server/tturrets/system/system_damage.qc
index 4eb143165..4145a6ea3 100644
--- a/qcsrc/server/tturrets/system/system_damage.qc
+++ b/qcsrc/server/tturrets/system/system_damage.qc
@@ -22,8 +22,6 @@ void turret_stdproc_die()
     self.takedamage             = DAMAGE_NO;
 
     self.health             = 0;
-	
-	MUTATOR_CALLHOOK(TurretDies);
 
 // Go boom
     //RadiusDamage (self,self, min(self.ammo,50),min(self.ammo,50) * 0.25,250,world,min(self.ammo,50)*5,DEATH_TURRET,world);
diff --git a/qcsrc/server/tturrets/system/system_main.qc b/qcsrc/server/tturrets/system/system_main.qc
index 39fe78ca8..b64cc3471 100644
--- a/qcsrc/server/tturrets/system/system_main.qc
+++ b/qcsrc/server/tturrets/system/system_main.qc
@@ -571,14 +571,6 @@ float turret_stdproc_firecheck()
 float turret_validate_target(entity e_turret, entity e_target, float validate_flags)
 {
     vector v_tmp;
-	
-	turret_target = e_target;
-	turret_flags = validate_flags;
-	turret = e_turret;
-	if(MUTATOR_CALLHOOK(TurretValidateTarget))
-		return 1;
-	e_target = turret_target;
-	e_turret = turret;
         
     //if(!validate_flags & TFL_TARGETSELECT_NOBUILTIN)
     //    return -0.5;