pre-merge

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

diff --git a/qcsrc/server/tturrets/system/system_main.qc b/qcsrc/server/tturrets/system/system_main.qc
index 8662d51ed48adb93f7f76498e461209fa9aea916..73125cfe4aa18b228270aabbceb6d7014b4b1b11 100644 (file)
--- a/qcsrc/server/tturrets/system/system_main.qc
+++ b/qcsrc/server/tturrets/system/system_main.qc
@@ -284,7 +284,9 @@ void turret_stdproc_track()
     self.tur_head.angles_y = anglemods(self.tur_head.angles_y);
 
     // Find the diffrence between where we currently aim and where we want to aim
-    move_angle = target_angle - (self.angles + self.tur_head.angles);
+    //move_angle = target_angle - (self.angles + self.tur_head.angles);
+    move_angle = AnglesTransform_ToAngles(AnglesTransform_LeftDivide(AnglesTransform_FromAngles(self.angles), AnglesTransform_FromAngles(target_angle))) - self.tur_head.angles;
+ 
     move_angle = shortangle_vxy(move_angle,(self.angles + self.tur_head.angles));
 
     switch(self.track_type)