Revert changes to electro combos (too controversial, will move to a different branch)

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / tturrets / system / system_aimprocs.qc

diff --git a/qcsrc/server/tturrets/system/system_aimprocs.qc b/qcsrc/server/tturrets/system/system_aimprocs.qc
index c3dbe55a4848d9d5d0505192a77cfab3057cd77c..fa21f1ac6613f389c1e361e1d8b86643ad058f81 100644 (file)
--- a/qcsrc/server/tturrets/system/system_aimprocs.qc
+++ b/qcsrc/server/tturrets/system/system_aimprocs.qc
@@ -11,7 +11,7 @@ vector turret_stdproc_aim_generic()
 {
 
     vector pre_pos, prep;
-    float distance, impact_time, i, mintime;
+    float distance, i, mintime;
 
     turret_tag_fire_update();
 
@@ -30,9 +30,7 @@ vector turret_stdproc_aim_generic()
                {
                        // FIXME: this cant be the best way to do this..
                        prep = pre_pos;
-#ifdef GMQCC
-                       impact_time = 0;
-#endif
+                       float impact_time = 0;
                        for(i = 0; i < 4; ++i)
                        {
                                distance = vlen(prep - self.tur_shotorg);
@@ -47,12 +45,12 @@ vector turret_stdproc_aim_generic()
                        if(self.enemy.movetype == MOVETYPE_WALK || self.enemy.movetype == MOVETYPE_TOSS || self.enemy.movetype == MOVETYPE_BOUNCE)
                        {
                                float vz;
-                               prep_z = pre_pos_z;
-                               vz = self.enemy.velocity_z;
+                               prep.z = pre_pos.z;
+                               vz = self.enemy.velocity.z;
                                for(i = 0; i < impact_time; i += sys_frametime)
                                {
                                        vz = vz - (autocvar_sv_gravity * sys_frametime);
-                                       prep_z = prep_z + vz * sys_frametime;
+                                       prep.z = prep.z + vz * sys_frametime;
                                }
                        }
                        pre_pos = prep;