From: Jakob MG <jakob_mg@hotmail.com>
Date: Sun, 19 Jun 2011 22:18:03 +0000 (+0200)
Subject: Better turret aim
X-Git-Tag: xonotic-v0.5.0~199^2^2~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=893347b3d8018b373b5b0f557c1786d93cf9ef3d;p=xonotic%2Fxonotic-data.pk3dir.git

Better turret aim
---

diff --git a/qcsrc/client/tturrets.qc b/qcsrc/client/tturrets.qc
index 0202fe82a..b83db07c7 100644
--- a/qcsrc/client/tturrets.qc
+++ b/qcsrc/client/tturrets.qc
@@ -197,8 +197,8 @@ void turret_ewheel_draw()
     self.tur_head.angles += dt * self.tur_head.move_avelocity;
     
     // Simulate banking
-    self.angles_z -= self.angles_z * dt * 2;
-    self.angles_z = bound(-45, self.angles_z  + ((self.move_angles_y - self.angles_y * -25) * dt), 45);
+    //self.angles_z -= self.angles_z * dt * 2;
+    //self.angles_z = bound(-45, self.angles_z  + ((self.move_angles_y - self.angles_y * -25) * dt), 45);
     
     self.angles_y = self.move_angles_y;
     
@@ -232,7 +232,7 @@ void turret_construct()
     self.tur_head.solid         = SOLID_NOT;
     self.movetype               = MOVETYPE_NOCLIP;
     self.tur_head.movetype      = MOVETYPE_NOCLIP;    
-    //self.draw                   = turret_draw;
+    self.draw                   = turret_draw;
     self.entremove              = turret_remove;
     self.drawmask = MASK_NORMAL;
     self.tur_head.drawmask = MASK_NORMAL;
diff --git a/qcsrc/server/tturrets/system/system_main.qc b/qcsrc/server/tturrets/system/system_main.qc
index 73125cfe4..6c51115df 100644
--- a/qcsrc/server/tturrets/system/system_main.qc
+++ b/qcsrc/server/tturrets/system/system_main.qc
@@ -285,9 +285,10 @@ void turret_stdproc_track()
 
     // 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 = 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));
+    //move_angle = shortangle_vxy(move_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.tur_head.angles);
 
     switch(self.track_type)
     {