Give vehicle crosshairs more consistent and self-explanatory names

diff --git a/gfx/vehicles/axh-bracket.tga b/gfx/vehicles/axh-bracket.tga
deleted file mode 100644 (file)
index e5681e3..0000000
Binary files a/gfx/vehicles/axh-bracket.tga and /dev/null differ

diff --git a/gfx/vehicles/axh-cross.tga b/gfx/vehicles/axh-cross.tga
deleted file mode 100644 (file)
index 887c278..0000000
Binary files a/gfx/vehicles/axh-cross.tga and /dev/null differ

diff --git a/gfx/vehicles/axh-dropcross.tga b/gfx/vehicles/axh-dropcross.tga
deleted file mode 100644 (file)
index 4215f32..0000000
Binary files a/gfx/vehicles/axh-dropcross.tga and /dev/null differ

diff --git a/gfx/vehicles/axh-ring.tga b/gfx/vehicles/axh-ring.tga
deleted file mode 100644 (file)
index 41cc167..0000000
Binary files a/gfx/vehicles/axh-ring.tga and /dev/null differ

diff --git a/gfx/vehicles/axh-special1.tga b/gfx/vehicles/axh-special1.tga
deleted file mode 100644 (file)
index 8709b58..0000000
Binary files a/gfx/vehicles/axh-special1.tga and /dev/null differ

diff --git a/gfx/vehicles/axh-tag.tga b/gfx/vehicles/axh-tag.tga
deleted file mode 100644 (file)
index b757a68..0000000
Binary files a/gfx/vehicles/axh-tag.tga and /dev/null differ

diff --git a/gfx/vehicles/crosshair_aim.tga b/gfx/vehicles/crosshair_aim.tga
new file mode 100644 (file)
index 0000000..8709b58
Binary files /dev/null and b/gfx/vehicles/crosshair_aim.tga differ

diff --git a/gfx/vehicles/crosshair_drop.tga b/gfx/vehicles/crosshair_drop.tga
new file mode 100644 (file)
index 0000000..4215f32
Binary files /dev/null and b/gfx/vehicles/crosshair_drop.tga differ

diff --git a/gfx/vehicles/crosshair_heal.tga b/gfx/vehicles/crosshair_heal.tga
new file mode 100644 (file)
index 0000000..887c278
Binary files /dev/null and b/gfx/vehicles/crosshair_heal.tga differ

diff --git a/gfx/vehicles/crosshair_hint.tga b/gfx/vehicles/crosshair_hint.tga
new file mode 100644 (file)
index 0000000..41cc167
Binary files /dev/null and b/gfx/vehicles/crosshair_hint.tga differ

diff --git a/gfx/vehicles/crosshair_lock.tga b/gfx/vehicles/crosshair_lock.tga
new file mode 100644 (file)
index 0000000..e5681e3
Binary files /dev/null and b/gfx/vehicles/crosshair_lock.tga differ

diff --git a/gfx/vehicles/crosshair_tag.tga b/gfx/vehicles/crosshair_tag.tga
new file mode 100644 (file)
index 0000000..b757a68
Binary files /dev/null and b/gfx/vehicles/crosshair_tag.tga differ

diff --git a/gfx/vehicles/turret_moving.tga b/gfx/vehicles/turret_moving.tga
new file mode 100644 (file)
index 0000000..04daf70
Binary files /dev/null and b/gfx/vehicles/turret_moving.tga differ

diff --git a/gfx/vehicles/turret_stationary.tga b/gfx/vehicles/turret_stationary.tga
new file mode 100644 (file)
index 0000000..9bbbb25
Binary files /dev/null and b/gfx/vehicles/turret_stationary.tga differ

diff --git a/gfx/vehicles/vth-mover.tga b/gfx/vehicles/vth-mover.tga
deleted file mode 100644 (file)
index 04daf70..0000000
Binary files a/gfx/vehicles/vth-mover.tga and /dev/null differ

diff --git a/gfx/vehicles/vth-stationary.tga b/gfx/vehicles/vth-stationary.tga
deleted file mode 100644 (file)
index 9bbbb25..0000000
Binary files a/gfx/vehicles/vth-stationary.tga and /dev/null differ

diff --git a/qcsrc/client/tturrets.qc b/qcsrc/client/tturrets.qc
index 86f8b4156cfe7079c389b86558df92dc1a7330a8..bc9c11e252fdf5f6fd0b485528d054c45c461aa3 100644 (file)
--- 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 7b0d5a3428e23185dd9fead69fa3ce11a869bc5c..0b6de3e8e29f5d13abacb52af87a5dfb2284e6d6 100644 (file)
--- 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;