From: Jakob MG <jakob_mg@hotmail.com>
Date: Wed, 22 Jun 2011 14:00:48 +0000 (+0200)
Subject: Trottle target re-validation to save a bit server preformance
X-Git-Tag: xonotic-v0.5.0~199^2^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b38275c8418d956e1412301df843ce4c16053a37;p=xonotic%2Fxonotic-data.pk3dir.git

Trottle target re-validation to save a bit server preformance
---

diff --git a/qcsrc/client/tturrets.qc b/qcsrc/client/tturrets.qc
index 15e972c10..55fcd88bc 100644
--- a/qcsrc/client/tturrets.qc
+++ b/qcsrc/client/tturrets.qc
@@ -227,7 +227,6 @@ void turret_draw()
     
 }
 
-
 void turret_walker_draw()
 {        
     float dt;
diff --git a/qcsrc/server/tturrets/include/turrets_early.qh b/qcsrc/server/tturrets/include/turrets_early.qh
index a8aed4553..e4531ceaf 100644
--- a/qcsrc/server/tturrets/include/turrets_early.qh
+++ b/qcsrc/server/tturrets/include/turrets_early.qh
@@ -342,7 +342,8 @@ vector real_origin(entity ent);
 //.float target_select_fov;
 /// Last timestamp this turret aquierd a valid target
 .float target_select_time;
-
+/// Throttle re-validation of current target
+.float target_validate_time;
 /*
 * Aim refers to real aiming, not gun pos (thats done by track)
 */
diff --git a/qcsrc/server/tturrets/system/system_main.qc b/qcsrc/server/tturrets/system/system_main.qc
index 6c51115df..2bc9f929a 100644
--- a/qcsrc/server/tturrets/system/system_main.qc
+++ b/qcsrc/server/tturrets/system/system_main.qc
@@ -140,7 +140,6 @@ void load_unit_settings(entity ent, string unitname, float is_reload)
             ent.turret_respawnhook();
 }
 
-
 /**
 ** updates enemy distances, predicted impact point/time
 ** and updated aim<->predict impact distance.
@@ -689,7 +688,6 @@ void turret_think()
     entity e;
 
     self.nextthink = time + self.ticrate;
-    //self.SendFlags = TNSF_UPDATE | TNSF_STATUS | TNSF_ANG | TNSF_AVEL;
     
     // ONS uses somewhat backwards linking.
     if (teamplay)
@@ -805,9 +803,11 @@ void turret_think()
             do_target_scan = 1;
 
         // Old target (if any) invalid?
+        if(self.target_validate_time < time)
         if (turret_validate_target(self, self.enemy, self.target_validate_flags) <= 0)
         {
         	self.enemy = world;
+        	self.target_validate_time = time + 0.5;
         	do_target_scan = 1;
         }
 
diff --git a/qcsrc/server/tturrets/system/system_misc.qc b/qcsrc/server/tturrets/system/system_misc.qc
index fc17121eb..f97f1091f 100644
--- a/qcsrc/server/tturrets/system/system_misc.qc
+++ b/qcsrc/server/tturrets/system/system_misc.qc
@@ -221,23 +221,6 @@ void turrets_precache_debug_models()
 
 void turrets_precash()
 {
-    //precache_model ("models/turrets/base.md3");
-    //precache_model ("models/turrets/flac.md3");
-    //precache_model ("models/turrets/pd_proj.md3");
-    //precache_model ("models/turrets/reactor.md3");
-    //precache_model ("models/turrets/mlrs_rocket.md3");
-    //precache_model ("models/turrets/hellion.md3");
-    //precache_model ("models/turrets/hunter2.md3");
-    //precache_model ("models/turrets/hk.md3");
-    //precache_model ("models/turrets/machinegun.md3");
-    //precache_model ("models/turrets/rocket.md3");
-    //precache_model ("models/turrets/mlrs.md3");
-    //precache_model ("models/turrets/phaser.md3");
-    //precache_model ("models/turrets/phaser_beam.md3");
-    //precache_model ("models/turrets/plasmad.md3");
-    //precache_model ("models/turrets/plasma.md3");
-    //precache_model ("models/turrets/tesla_head.md3");
-    //precache_model ("models/turrets/tesla_base.md3");
     #ifdef TURRET_DEBUG
 	turrets_precache_debug_models();
 	#endif