X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ftturrets%2Fsystem%2Fsystem_aimprocs.qc;h=fa21f1ac6613f389c1e361e1d8b86643ad058f81;hb=4566767f430d7a15f918d80b234f04c71f929b4e;hp=a291e3ab15759496c1e8a316d29c0cc12aa136a7;hpb=26ec33d6d19e627b43ac2cb51f83f890b5176293;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/tturrets/system/system_aimprocs.qc b/qcsrc/server/tturrets/system/system_aimprocs.qc
index a291e3ab1..fa21f1ac6 100644
--- 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();
 
@@ -25,11 +25,12 @@ vector turret_stdproc_aim_generic()
 
     // Lead?
     if (self.aim_flags & TFL_AIM_LEAD)
-    {    	
+    {
 		if (self.aim_flags & TFL_AIM_SHOTTIMECOMPENSATE)       // Need to conpensate for shot traveltime
 		{
 			// FIXME: this cant be the best way to do this..
 			prep = pre_pos;
+			float impact_time = 0;
 			for(i = 0; i < 4; ++i)
 			{
 				distance = vlen(prep - self.tur_shotorg);
@@ -40,16 +41,16 @@ vector turret_stdproc_aim_generic()
 			prep = pre_pos + (self.enemy.velocity * (impact_time + mintime));
 
 			if(self.aim_flags & TFL_AIM_ZPREDICT)
-			if not(self.enemy.flags & FL_ONGROUND)
+			if (!(self.enemy.flags & FL_ONGROUND))
 			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;
@@ -57,7 +58,7 @@ vector turret_stdproc_aim_generic()
 		else
 			pre_pos = pre_pos + self.enemy.velocity * mintime;
     }
-    
+
     if(self.aim_flags & TFL_AIM_GROUNDGROUND)
     {
         //tracebox(pre_pos + '0 0 32',self.enemy.mins,self.enemy.maxs,pre_pos -'0 0 64',MOVE_WORLDONLY,self.enemy);