Revise vehicle crosshairs

diff --git a/gfx/vehicles/axh-bracket.tga b/gfx/vehicles/axh-bracket.tga
index 82f079660227fc39593a0485c69a3e69b48aff90..e5681e362a7429a95f0be3a7bb06f1ebd9a670f0 100644 (file)
Binary files a/gfx/vehicles/axh-bracket.tga and b/gfx/vehicles/axh-bracket.tga differ

diff --git a/gfx/vehicles/axh-cross.tga b/gfx/vehicles/axh-cross.tga
index 69e1c0be0f19a593bfdf385d9b955aab94eb8737..887c278a7d0797a8a3481b04da84e2e9151ba35d 100644 (file)
Binary files a/gfx/vehicles/axh-cross.tga and b/gfx/vehicles/axh-cross.tga differ

diff --git a/gfx/vehicles/axh-dropcross.tga b/gfx/vehicles/axh-dropcross.tga
index e8ba095fd59c26a4fff7e8806f1eeda09b019116..4215f326b6b84dd6e1472e074434704735da1529 100644 (file)
Binary files a/gfx/vehicles/axh-dropcross.tga and b/gfx/vehicles/axh-dropcross.tga differ

diff --git a/gfx/vehicles/axh-ring.tga b/gfx/vehicles/axh-ring.tga
index bb3ade5884201cd3656e2cf96f733a20fe65c497..41cc167b66c476c200bf53cb28e88d768b86548f 100644 (file)
Binary files a/gfx/vehicles/axh-ring.tga and b/gfx/vehicles/axh-ring.tga differ

diff --git a/gfx/vehicles/axh-special1.tga b/gfx/vehicles/axh-special1.tga
index 184a065c0a6eaaa0e9a0b3a8ac1786dd52291e0d..8709b58ccac52e006f6989f6b0248ad0c5ae3585 100644 (file)
Binary files a/gfx/vehicles/axh-special1.tga and b/gfx/vehicles/axh-special1.tga differ

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

diff --git a/gfx/vehicles/axh-tag.tga b/gfx/vehicles/axh-tag.tga
index 4eb3b66c22e0bc4d45065d901061bd2547afe695..b757a684834fc6f8787954d92a6a9d18d156ea78 100644 (file)
Binary files a/gfx/vehicles/axh-tag.tga and b/gfx/vehicles/axh-tag.tga differ

diff --git a/gfx/vehicles/vth-mover.tga b/gfx/vehicles/vth-mover.tga
index d831896ff90ef41dd88b2856a6270c1491e75196..04daf70de1b743edded9eb9e37c166bf2f4c296c 100644 (file)
Binary files a/gfx/vehicles/vth-mover.tga and b/gfx/vehicles/vth-mover.tga differ

diff --git a/gfx/vehicles/vth-stationary.tga b/gfx/vehicles/vth-stationary.tga
index 31703bcfeaf4fb1614d2bcfda859c29f687963d6..9bbbb25d8357bac211496daf05650251480c74cc 100644 (file)
Binary files a/gfx/vehicles/vth-stationary.tga and b/gfx/vehicles/vth-stationary.tga differ

diff --git a/qcsrc/client/vehicles/all.qc b/qcsrc/client/vehicles/all.qc
index 1bc991db04ffb50ea1dd9e7d784c7a1dc4ecd320..a4736687a6280ee020686191351ad21df8148771 100644 (file)
--- a/qcsrc/client/vehicles/all.qc
+++ b/qcsrc/client/vehicles/all.qc
@@ -45,13 +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_BRACKET  = "gfx/vehicles/axh-bracket.tga";
-const string vCROSS_CROSS    = "gfx/vehicles/axh-cross.tga";
-const string vCROSS_DROP     = "gfx/vehicles/axh-dropcross.tga";
-const string vCROSS_RING     = "gfx/vehicles/axh-ring.tga";
-const string vCROSS_SPECIAL1 = "gfx/vehicles/axh-special1.tga";
-const string vCROSS_SPECIAL2 = "gfx/vehicles/axh-special2.tga";
-const string vCROSS_TAG      = "gfx/vehicles/axh-tag.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 int SBRM_FIRST     = 1;
 const int SBRM_VOLLY     = 1;
@@ -109,7 +108,7 @@ void Net_AuXair2(bool bIsNew)
                axh.drawmask     = MASK_NORMAL;
                axh.axh_drawflag = DRAWFLAG_ADDITIVE;
                axh.axh_fadetime = 0.1;
-               axh.axh_image    = vCROSS_RING;
+               axh.axh_image    = vCROSS_HINT;
                axh.alpha        = 1;
 
                AuxiliaryXhairs[axh_id] = axh;
@@ -160,7 +159,7 @@ void Net_VehicleSetup()
                axh.drawmask     = MASK_NORMAL;
                axh.axh_drawflag = DRAWFLAG_NORMAL;
                axh.axh_fadetime = 0.1;
-               axh.axh_image    = vCROSS_RING;
+               axh.axh_image    = vCROSS_HINT;
                axh.alpha        = 1;
                AuxiliaryXhairs[i] = axh;
        }
@@ -168,29 +167,27 @@ void Net_VehicleSetup()
        switch(hud_id)
        {
                case HUD_SPIDERBOT:
-                       AuxiliaryXhairs[0].axh_image = vCROSS_RING; // Minigun1
-                       AuxiliaryXhairs[1].axh_image = vCROSS_RING; // Minigun2
-                       AuxiliaryXhairs[2].axh_image = vCROSS_SPECIAL1; // Rocket
+                       AuxiliaryXhairs[0].axh_image = vCROSS_HINT; // Minigun1
+                       AuxiliaryXhairs[1].axh_image = vCROSS_HINT; // Minigun2
                        break;
 
                case HUD_WAKIZASHI:
-                       AuxiliaryXhairs[0].axh_image = vCROSS_BRACKET; // Rocket
+                       AuxiliaryXhairs[0].axh_image = vCROSS_LOCK; // Rocket
                        break;
 
                case HUD_RAPTOR:
-                       AuxiliaryXhairs[0].axh_image = vCROSS_SPECIAL2;
-                       AuxiliaryXhairs[1].axh_image = vCROSS_BRACKET;
+                       AuxiliaryXhairs[1].axh_image = vCROSS_LOCK;
                        break;
 
                case HUD_BUMBLEBEE:
-                       AuxiliaryXhairs[0].axh_image = vCROSS_BRACKET; // Raygun-locked
+                       AuxiliaryXhairs[0].axh_image = vCROSS_LOCK; // Raygun-locked
                        AuxiliaryXhairs[1].axh_image = vCROSS_TAG; // Gunner1
                        AuxiliaryXhairs[2].axh_image = vCROSS_TAG; // Gunner2
                        break;
 
                case HUD_BUMBLEBEE_GUN:
-                       AuxiliaryXhairs[0].axh_image = vCROSS_BRACKET; // Plasma cannons
-                       AuxiliaryXhairs[1].axh_image = vCROSS_BRACKET; // Raygun
+                       AuxiliaryXhairs[0].axh_image = vCROSS_LOCK; // Plasma cannons
+                       AuxiliaryXhairs[1].axh_image = vCROSS_LOCK; // Raygun
                        break;
        }
 }
@@ -433,7 +430,7 @@ void Vehicles_drawHUD(
 
 void CSQC_BUMBLE_HUD()
 {
-       Vehicles_drawHUD(vMODEL_BUMBLE, vMODEL_BUMBLE_WEAPON1, vMODEL_BUMBLE_WEAPON2, vICON_AMMO1, vICON_AMMO1, vCROSS_SPECIAL1, TRUE, FALSE);
+       Vehicles_drawHUD(vMODEL_BUMBLE, vMODEL_BUMBLE_WEAPON1, vMODEL_BUMBLE_WEAPON2, vICON_AMMO1, vICON_AMMO1, vCROSS_HEAL, TRUE, FALSE);
 }
 
 void CSQC_BUMBLE_GUN_HUD()
@@ -447,8 +444,8 @@ void CSQC_SPIDER_HUD()
 
        switch(weapon2mode)
        {
-               case SBRM_VOLLY: crosshair = vCROSS_BRACKET; break;
-               case SBRM_GUIDE: crosshair = vCROSS_CROSS;   break;
+               case SBRM_VOLLY: crosshair = vCROSS_LOCK; break;
+               case SBRM_GUIDE: crosshair = vCROSS_AIM;  break;
                default:         crosshair = vCROSS_TAG;
        }
 
@@ -461,8 +458,8 @@ void CSQC_RAPTOR_HUD()
 
        switch(weapon2mode)
        {
-               case RSM_FLARE: crosshair = vCROSS_BRACKET; break;
-               default:        crosshair = vCROSS_RING;
+               case RSM_FLARE: crosshair = vCROSS_LOCK; break;
+               default:        crosshair = vCROSS_AIM;
        }
 
        Vehicles_drawHUD(vMODEL_RAPTOR, vMODEL_RAPTOR_WEAPON1, vMODEL_RAPTOR_WEAPON2, vICON_AMMO1, vICON_AMMO2, crosshair, FALSE, TRUE);
@@ -470,7 +467,7 @@ void CSQC_RAPTOR_HUD()
 
 void CSQC_WAKIZASHI_HUD()
 {
-       Vehicles_drawHUD(vMODEL_RACER, vMODEL_RACER_WEAPON1, vMODEL_RACER_WEAPON2, vICON_AMMO1, vICON_AMMO2, vCROSS_SPECIAL1, FALSE, FALSE);
+       Vehicles_drawHUD(vMODEL_RACER, vMODEL_RACER_WEAPON1, vMODEL_RACER_WEAPON2, vICON_AMMO1, vICON_AMMO2, vCROSS_AIM, FALSE, FALSE);
 }
 
 void Vehicles_Precache()