From 814d1b929cc4fd800128b54e368d39ce0eb619da Mon Sep 17 00:00:00 2001 From: div0 Date: Thu, 29 Jan 2009 12:39:37 +0000 Subject: [PATCH] minor reordering of code in target selection, should run faster git-svn-id: svn://svn.icculus.org/nexuiz/trunk@5696 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- .../server/tturrets/system/system_main.qc | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/data/qcsrc/server/tturrets/system/system_main.qc b/data/qcsrc/server/tturrets/system/system_main.qc index 6685c98a3..fe3a7be3b 100644 --- a/data/qcsrc/server/tturrets/system/system_main.qc +++ b/data/qcsrc/server/tturrets/system/system_main.qc @@ -454,15 +454,15 @@ float turret_validate_target(entity e_turret,entity e_target,float validate_flag } } - // Line of sight? - if (validate_flags & TFL_TARGETSELECT_LOS) + // Range limits? + tvt_dist = vlen(e_turret.origin - real_origin(e_target)); + if (validate_flags & TFL_TARGETSELECT_RANGELIMTS) { - v_tmp = real_origin(e_target) + ((e_target.mins + e_target.maxs) * 0.5); - //v_tmp = e_target.origin; - traceline(e_turret.origin + e_turret.tur_aimorg,v_tmp,0,e_turret); + if (tvt_dist < e_turret.target_range_min) + return -13; - if (e_turret.aim_firetolerance_dist < vlen(v_tmp - trace_endpos)) - return -10; + if (tvt_dist > e_turret.target_range) + return -14; } // Can we even aim this thing? @@ -480,15 +480,15 @@ float turret_validate_target(entity e_turret,entity e_target,float validate_flag return -12; } - // Range limits? - tvt_dist = vlen(e_turret.origin - real_origin(e_target)); - if (validate_flags & TFL_TARGETSELECT_RANGELIMTS) + // Line of sight? + if (validate_flags & TFL_TARGETSELECT_LOS) { - if (tvt_dist < e_turret.target_range_min) - return -13; + v_tmp = real_origin(e_target) + ((e_target.mins + e_target.maxs) * 0.5); + //v_tmp = e_target.origin; + traceline(e_turret.origin + e_turret.tur_aimorg,v_tmp,0,e_turret); - if (tvt_dist > e_turret.target_range) - return -14; + if (e_turret.aim_firetolerance_dist < vlen(v_tmp - trace_endpos)) + return -10; } #ifdef TURRET_DEBUG_TARGETSELECT -- 2.39.2