From b2c3a0a5104cd241a6258abac23f056d308854f9 Mon Sep 17 00:00:00 2001
From: Severin Meyer <sev.ch@web.de>
Date: Fri, 24 Jul 2015 20:29:11 +0200
Subject: [PATCH] Give vehicle crosshairs more consistent and self-explanatory
 names

---
 .../{axh-special1.tga => crosshair_aim.tga}         | Bin
 .../{axh-dropcross.tga => crosshair_drop.tga}       | Bin
 gfx/vehicles/{axh-cross.tga => crosshair_heal.tga}  | Bin
 gfx/vehicles/{axh-ring.tga => crosshair_hint.tga}   | Bin
 .../{axh-bracket.tga => crosshair_lock.tga}         | Bin
 gfx/vehicles/{axh-tag.tga => crosshair_tag.tga}     | Bin
 gfx/vehicles/{vth-mover.tga => turret_moving.tga}   | Bin
 .../{vth-stationary.tga => turret_stationary.tga}   | Bin
 qcsrc/client/tturrets.qc                            |   4 ++--
 qcsrc/client/vehicles/all.qc                        |  12 ++++++------
 10 files changed, 8 insertions(+), 8 deletions(-)
 rename gfx/vehicles/{axh-special1.tga => crosshair_aim.tga} (100%)
 rename gfx/vehicles/{axh-dropcross.tga => crosshair_drop.tga} (100%)
 rename gfx/vehicles/{axh-cross.tga => crosshair_heal.tga} (100%)
 rename gfx/vehicles/{axh-ring.tga => crosshair_hint.tga} (100%)
 rename gfx/vehicles/{axh-bracket.tga => crosshair_lock.tga} (100%)
 rename gfx/vehicles/{axh-tag.tga => crosshair_tag.tga} (100%)
 rename gfx/vehicles/{vth-mover.tga => turret_moving.tga} (100%)
 rename gfx/vehicles/{vth-stationary.tga => turret_stationary.tga} (100%)

diff --git a/gfx/vehicles/axh-special1.tga b/gfx/vehicles/crosshair_aim.tga
similarity index 100%
rename from gfx/vehicles/axh-special1.tga
rename to gfx/vehicles/crosshair_aim.tga
diff --git a/gfx/vehicles/axh-dropcross.tga b/gfx/vehicles/crosshair_drop.tga
similarity index 100%
rename from gfx/vehicles/axh-dropcross.tga
rename to gfx/vehicles/crosshair_drop.tga
diff --git a/gfx/vehicles/axh-cross.tga b/gfx/vehicles/crosshair_heal.tga
similarity index 100%
rename from gfx/vehicles/axh-cross.tga
rename to gfx/vehicles/crosshair_heal.tga
diff --git a/gfx/vehicles/axh-ring.tga b/gfx/vehicles/crosshair_hint.tga
similarity index 100%
rename from gfx/vehicles/axh-ring.tga
rename to gfx/vehicles/crosshair_hint.tga
diff --git a/gfx/vehicles/axh-bracket.tga b/gfx/vehicles/crosshair_lock.tga
similarity index 100%
rename from gfx/vehicles/axh-bracket.tga
rename to gfx/vehicles/crosshair_lock.tga
diff --git a/gfx/vehicles/axh-tag.tga b/gfx/vehicles/crosshair_tag.tga
similarity index 100%
rename from gfx/vehicles/axh-tag.tga
rename to gfx/vehicles/crosshair_tag.tga
diff --git a/gfx/vehicles/vth-mover.tga b/gfx/vehicles/turret_moving.tga
similarity index 100%
rename from gfx/vehicles/vth-mover.tga
rename to gfx/vehicles/turret_moving.tga
diff --git a/gfx/vehicles/vth-stationary.tga b/gfx/vehicles/turret_stationary.tga
similarity index 100%
rename from gfx/vehicles/vth-stationary.tga
rename to gfx/vehicles/turret_stationary.tga
diff --git a/qcsrc/client/tturrets.qc b/qcsrc/client/tturrets.qc
index 86f8b4156..bc9c11e25 100644
--- a/qcsrc/client/tturrets.qc
+++ b/qcsrc/client/tturrets.qc
@@ -285,9 +285,9 @@ 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) * autocvar_cl_vehicles_crosshair_size;
                     drawpic(o - pz * 0.5, txt, pz , '1 1 1', 0.7, DRAWFLAG_NORMAL);
diff --git a/qcsrc/client/vehicles/all.qc b/qcsrc/client/vehicles/all.qc
index 7b0d5a342..0b6de3e8e 100644
--- a/qcsrc/client/vehicles/all.qc
+++ b/qcsrc/client/vehicles/all.qc
@@ -45,12 +45,12 @@ const string vICON_SHIELD = "gfx/vehicles/shield.tga";
 const string vICON_AMMO1  = "gfx/vehicles/bullets.tga";
 const string vICON_AMMO2  = "gfx/vehicles/rocket.tga";
 
-const string vCROSS_AIM  = "gfx/vehicles/axh-special1.tga";
-const string vCROSS_DROP = "gfx/vehicles/axh-dropcross.tga";
-const string vCROSS_HEAL = "gfx/vehicles/axh-cross.tga";
-const string vCROSS_HINT = "gfx/vehicles/axh-ring.tga";
-const string vCROSS_LOCK = "gfx/vehicles/axh-bracket.tga";
-const string vCROSS_TAG  = "gfx/vehicles/axh-tag.tga";
+const string vCROSS_AIM  = "gfx/vehicles/crosshair_aim.tga";
+const string vCROSS_DROP = "gfx/vehicles/crosshair_drop.tga";
+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_TAG  = "gfx/vehicles/crosshair_tag.tga.tga";
 
 const int SBRM_FIRST     = 1;
 const int SBRM_VOLLY     = 1;
-- 
2.39.2