Merge branch 'master' into Mario/turrets

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / turrets / cl_turrets.qc

diff --git a/qcsrc/common/turrets/cl_turrets.qc b/qcsrc/common/turrets/cl_turrets.qc
index 2f8e77d2d20b7f2bbdb57bbc1cb267fcf48c1f8b..c39b938b86a686a0e13d2c3c8f80e9bcee689b4f 100644 (file)
--- a/qcsrc/common/turrets/cl_turrets.qc
+++ b/qcsrc/common/turrets/cl_turrets.qc
@@ -85,12 +85,12 @@ void turret_draw2d()
                if(hud != HUD_NORMAL)
                {
                        if((get_turretinfo(self.turretid)).spawnflags & TUR_FLAG_MOVE)
-                               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);
                }
        }