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 1901e4e25c2ff7cb65c4e0a4e3b80bcc51bbedb4..fa21f1ac6613f389c1e361e1d8b86643ad058f81 100644 (file)
--- a/qcsrc/server/tturrets/system/system_aimprocs.qc
+++ b/qcsrc/server/tturrets/system/system_aimprocs.qc
@@ -45,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;