Merge branch 'sev/menu_icons_mipmap' into 'master'

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

diff --git a/qcsrc/server/tturrets/system/system_misc.qc b/qcsrc/server/tturrets/system/system_misc.qc
index 78aa63c09b7703bcd7b45aee73c63041ec9344fd..1885f67c173a756d88ecc19afc289408feb51fc9 100644 (file)
--- a/qcsrc/server/tturrets/system/system_misc.qc
+++ b/qcsrc/server/tturrets/system/system_misc.qc
@@ -36,9 +36,9 @@ vector shortangle_v(vector ang1, vector ang2)
 {
     vector vtmp;
 
-    vtmp_x = shortangle_f(ang1_x,ang2_x);
-    vtmp_y = shortangle_f(ang1_y,ang2_y);
-    vtmp_z = shortangle_f(ang1_z,ang2_z);
+    vtmp.x = shortangle_f(ang1_x,ang2_x);
+    vtmp.y = shortangle_f(ang1_y,ang2_y);
+    vtmp.z = shortangle_f(ang1_z,ang2_z);
 
     return vtmp;
 }
@@ -47,8 +47,8 @@ vector shortangle_vxy(vector ang1, vector ang2)
 {
     vector vtmp = '0 0 0';
 
-    vtmp_x = shortangle_f(ang1_x,ang2_x);
-    vtmp_y = shortangle_f(ang1_y,ang2_y);
+    vtmp.x = shortangle_f(ang1_x,ang2_x);
+    vtmp.y = shortangle_f(ang1_y,ang2_y);
 
     return vtmp;
 }
@@ -133,7 +133,7 @@ float turret_tag_fire_update_s()
 * Railgun-like beam, but has thickness and suppots slowing of target
 */
 void FireImoBeam (vector start, vector end, vector smin, vector smax,
-                  float bforce, float f_dmg, float f_velfactor, float deathtype)
+                  float bforce, float f_dmg, float f_velfactor, int deathtype)
 
 {
     vector hitloc, force, endpoint, dir;
@@ -229,7 +229,6 @@ void turrets_precash()
 
 
 #ifdef TURRET_DEBUG
-void SUB_Remove();
 void marker_think()
 {
     if(self.cnt)