Merge branch 'Mario/send_effects' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / tturrets.qc

diff --git a/qcsrc/client/tturrets.qc b/qcsrc/client/tturrets.qc
index b74024d508aa09b0bf5dab2b660447aa5f2d5f33..c87418ea4be5c05497dc1e0dc9e24d4ec99865bf 100644 (file)
--- a/qcsrc/client/tturrets.qc
+++ b/qcsrc/client/tturrets.qc
@@ -3,13 +3,14 @@
 
 #include "hud.qh"
 #include "movelib.qh"
-#include "movetypes.qh"
 #include "prandom.qh"
 #include "teamradar.qh"
 #include "waypointsprites.qh"
 
 #include "../common/teams.qh"
 
+#include "../common/movetypes/movetypes.qh"
+
 #include "../server/tturrets/include/turrets_early.qh"
 
 #include "../warpzonelib/anglestransform.qh"
@@ -285,12 +286,12 @@ void turret_draw2d()
                 case HUD_RAPTOR:
                 case HUD_BUMBLEBEE:
                     if(self.turret_type == TID_EWHEEL || self.turret_type == TID_WALKER)
-                        txt = "gfx/vehicles/vth-mover.tga";
+                        txt = "gfx/vehicles/turret_moving.tga";
                     else
-                        txt = "gfx/vehicles/vth-stationary.tga";
+                        txt = "gfx/vehicles/turret_stationary.tga";
 
-                    vector pz = drawgetimagesize(txt) * 0.25;
-                    drawpic(o - pz * 0.5, txt, pz , '1 1 1', 0.75, DRAWFLAG_NORMAL);
+                    vector pz = drawgetimagesize(txt) * autocvar_cl_vehicles_crosshair_size;
+                    drawpic(o - pz * 0.5, txt, pz , '1 1 1', 0.7, DRAWFLAG_NORMAL);
                     break;
             }
         }