From cf0911425c96d9afa897e6ea6b250958b9ed7a13 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 21 Aug 2015 20:01:52 +1000 Subject: [PATCH] Fix a couple of leftovers from bad merges --- qcsrc/client/tturrets.qc | 4 ++-- qcsrc/common/vehicles/cl_vehicles.qc | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/qcsrc/client/tturrets.qc b/qcsrc/client/tturrets.qc index 6fe073e27..d469fdcca 100644 --- a/qcsrc/client/tturrets.qc +++ b/qcsrc/client/tturrets.qc @@ -280,9 +280,9 @@ void turret_draw2d() if(hud != HUD_NORMAL) { 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) * autocvar_cl_vehicles_crosshair_size; drawpic(o - pz * 0.5, txt, pz , '1 1 1', 0.7, DRAWFLAG_NORMAL); diff --git a/qcsrc/common/vehicles/cl_vehicles.qc b/qcsrc/common/vehicles/cl_vehicles.qc index 65f050f3b..2511defb4 100644 --- a/qcsrc/common/vehicles/cl_vehicles.qc +++ b/qcsrc/common/vehicles/cl_vehicles.qc @@ -5,8 +5,6 @@ const string vCROSS_HEAL = "gfx/vehicles/crosshair_heal.tga"; const string vCROSS_HINT = "gfx/vehicles/crosshair_hint.tga"; const string vCROSS_LOCK = "gfx/vehicles/crosshair_lock.tga"; const string vCROSS_RAIN = "gfx/vehicles/crosshair_rain.tga"; -const string vCROSS_TANK = "gfx/vehicles/crosshair_tank.tga"; -const string vCROSS_TANK2 = "gfx/vehicles/crosshair_tank2.tga"; entity dropmark; -- 2.39.2