Use hud_skin when fetching images from /gfx/hud/

Previously some display methods (of Weapon, GameItem, StatusEffects, and Nades) tried to access `/gfx/hud/{menu_skin}`, when they should be accessing `/gfx/hud/{hud_skin}`.
This was introduced by 51c7e0a875.
Until !1412 this didn't cause any visible bugs because the display methods were never called, and consequently (after !1412) on menu skins other than `luma`, some or all weapon icons wouldn't show in the list.
This change fixes that issue.

diff --git a/qcsrc/common/items/item.qh b/qcsrc/common/items/item.qh
index 1b29d71bd526f773b2d0153e3e009dec3903ee39..fb8ea45a2e7bfd235df991e99fb7ac4acfd5c277 100644 (file)
--- a/qcsrc/common/items/item.qh
+++ b/qcsrc/common/items/item.qh
@@ -135,7 +135,7 @@ CLASS(GameItem, Object)
     METHOD(GameItem, display, void(GameItem this, void(string name, string icon) returns))
     {
         TC(GameItem, this);
-        returns(this.m_name, this.m_icon ? sprintf("/gfx/hud/%s/%s", cvar_string("menu_skin"), this.m_icon) : string_null);
+        returns(this.m_name, this.m_icon ? sprintf("/gfx/hud/%s/%s", cvar_string("hud_skin"), this.m_icon) : string_null);
     }
     METHOD(GameItem, show, void(GameItem this))
     {

diff --git a/qcsrc/common/mutators/mutator/buffs/buffs.qh b/qcsrc/common/mutators/mutator/buffs/buffs.qh
index c4580212e6bb4de1930a813bc0a278e94dab876a..b936cac65ecc7af33719f47fe84a778dda593738 100644 (file)
--- a/qcsrc/common/mutators/mutator/buffs/buffs.qh
+++ b/qcsrc/common/mutators/mutator/buffs/buffs.qh
@@ -23,7 +23,7 @@ CLASS(Buff, StatusEffect)
        ATTRIB(Buff, m_lifetime, float, 60);
        ATTRIB(Buff, m_sprite, string, "");
        METHOD(Buff, display, void(entity this, void(string name, string icon) returns)) {
-               returns(this.m_name, sprintf("/gfx/hud/%s/%s", cvar_string("menu_skin"), this.m_icon));
+               returns(this.m_name, sprintf("/gfx/hud/%s/%s", cvar_string("hud_skin"), this.m_icon));
        }
 #ifdef SVQC
        METHOD(Buff, m_time, float(Buff this))

diff --git a/qcsrc/common/mutators/mutator/nades/nades.qh b/qcsrc/common/mutators/mutator/nades/nades.qh
index b328d2ed79dab49a19b70557319b360e1ab63d29..456fb608ab816f16e3de5e3deb329c6296bed035 100644 (file)
--- a/qcsrc/common/mutators/mutator/nades/nades.qh
+++ b/qcsrc/common/mutators/mutator/nades/nades.qh
@@ -17,7 +17,7 @@ CLASS(Nade, Object)
     ATTRIBARRAY(Nade, m_projectile, int, 2);
     ATTRIBARRAY(Nade, m_trail, entity, 2);
     METHOD(Nade, display, void(entity this, void(string name, string icon) returns)) {
-        returns(this.m_name, sprintf("/gfx/hud/%s/%s", cvar_string("menu_skin"), this.m_icon));
+        returns(this.m_name, sprintf("/gfx/hud/%s/%s", cvar_string("hud_skin"), this.m_icon));
     }
 ENDCLASS(Nade)
 

diff --git a/qcsrc/common/mutators/mutator/status_effects/all.qh b/qcsrc/common/mutators/mutator/status_effects/all.qh
index 05ab15776282f282f482173eeb00340ddff1ec11..b2f8ec4e57c14fd9633c0a83178bf97c73f892a3 100644 (file)
--- a/qcsrc/common/mutators/mutator/status_effects/all.qh
+++ b/qcsrc/common/mutators/mutator/status_effects/all.qh
@@ -54,6 +54,6 @@ CLASS(StatusEffect, Object)
        METHOD(StatusEffect, display, void(StatusEffect this, void(string name, string icon) returns))
        {
                TC(StatusEffect, this);
-               returns(this.m_name, this.m_icon ? sprintf("/gfx/hud/%s/%s", cvar_string("menu_skin"), this.m_icon) : string_null);
+               returns(this.m_name, this.m_icon ? sprintf("/gfx/hud/%s/%s", cvar_string("hud_skin"), this.m_icon) : string_null);
        }
 ENDCLASS(StatusEffect)

diff --git a/qcsrc/common/weapons/weapon.qh b/qcsrc/common/weapons/weapon.qh
index 4cc04b26e5ec71bd893ca7f18610dbfad29f3b79..0a7813428ab0f0f7cb9a67c5aaecb37fa8ec08e0 100644 (file)
--- a/qcsrc/common/weapons/weapon.qh
+++ b/qcsrc/common/weapons/weapon.qh
@@ -127,7 +127,7 @@ CLASS(Weapon, Object)
        /** (SERVER) update cvar based properties */
        METHOD(Weapon, wr_update, void(Weapon this)) {}
        METHOD(Weapon, display, void(entity this, void(string name, string icon) returns)) {
-               returns(this.m_name, this.model2 ? sprintf("/gfx/hud/%s/%s", cvar_string("menu_skin"), this.model2) : string_null);
+               returns(this.m_name, this.model2 ? sprintf("/gfx/hud/%s/%s", cvar_string("hud_skin"), this.model2) : string_null);
        }
 ENDCLASS(Weapon)