From c709117209ce2d532f6004002673572e8a8c0679 Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Sun, 31 May 2020 12:54:04 +0200 Subject: [PATCH] Switch to using spriteframe() for HUD sprites in valve, scihunt --- src/client/defs.h | 2 ++ src/client/valve/defs.h | 10 ++++++++ src/client/valve/hud.c | 36 ++++++++++++++--------------- src/client/valve/hud_weaponselect.c | 4 ++-- src/client/valve/scoreboard.c | 2 +- src/menu-fn/entry.cpp | 2 +- src/shared/scihunt/w_cannon.c | 14 +++++++---- src/shared/scihunt/w_chainsaw.c | 10 +++++--- src/shared/scihunt/w_hammer.c | 10 +++++--- src/shared/valve/w_crossbow.c | 8 +++---- src/shared/valve/w_crowbar.c | 4 ++-- src/shared/valve/w_egon.c | 8 +++---- src/shared/valve/w_gauss.c | 8 +++---- src/shared/valve/w_glock.c | 8 +++---- src/shared/valve/w_handgrenade.c | 6 ++--- src/shared/valve/w_hornetgun.c | 8 +++---- src/shared/valve/w_mp5.c | 10 ++++---- src/shared/valve/w_python.c | 8 +++---- src/shared/valve/w_rpg.c | 8 +++---- src/shared/valve/w_satchel.c | 6 ++--- src/shared/valve/w_shotgun.c | 8 +++---- src/shared/valve/w_snark.c | 6 ++--- src/shared/valve/w_tripmine.c | 6 ++--- 23 files changed, 108 insertions(+), 84 deletions(-) diff --git a/src/client/defs.h b/src/client/defs.h index 8f0bca00..a1ba619c 100644 --- a/src/client/defs.h +++ b/src/client/defs.h @@ -75,6 +75,8 @@ float clframetime; /* prototypes */ void Damage_Draw(void); +string(string modelname, int frame, float frametime) spriteframe = #0; + void drawstring_r(vector p, string t, vector s, vector c, float a, float f) { diff --git a/src/client/valve/defs.h b/src/client/valve/defs.h index 112a28a1..8e759e8f 100644 --- a/src/client/valve/defs.h +++ b/src/client/valve/defs.h @@ -23,6 +23,16 @@ vector g_hud_color; vector g_hudmins; vector g_hudres; +var string g_hud1_spr; +var string g_hud2_spr; +var string g_hud3_spr; +var string g_hud4_spr; +var string g_hud5_spr; +var string g_hud6_spr; +var string g_hud7_spr; +var string g_cross_spr; +var string g_laser_spr; + struct { /* viewmodel stuff */ diff --git a/src/client/valve/hud.c b/src/client/valve/hud.c index ce89e5a7..14e406e0 100644 --- a/src/client/valve/hud.c +++ b/src/client/valve/hud.c @@ -17,7 +17,6 @@ void HUD_DrawWeaponSelect(void); /* Use first frame for drawing (needs precache) */ -#define HUD_NUMS "sprites/640hud7.spr_0.tga" #define NUMSIZE_X 24/256 #define NUMSIZE_Y 24/128 #define HUD_ALPHA 0.5 @@ -75,14 +74,15 @@ float spr_flash2[4] = { void HUD_Init(void) { - precache_model("sprites/640hud1.spr"); - precache_model("sprites/640hud2.spr"); - precache_model("sprites/640hud3.spr"); - precache_model("sprites/640hud4.spr"); - precache_model("sprites/640hud5.spr"); - precache_model("sprites/640hud6.spr"); - precache_model("sprites/640hud7.spr"); - precache_model("sprites/640_logo.spr"); + g_cross_spr = spriteframe("sprites/crosshairs.spr", 0, 0.0f); + g_laser_spr = spriteframe("sprites/laserdot.spr", 0, 0.0f); + g_hud1_spr = spriteframe("sprites/640hud1.spr", 0, 0.0f); + g_hud2_spr = spriteframe("sprites/640hud2.spr", 0, 0.0f); + g_hud3_spr = spriteframe("sprites/640hud3.spr", 0, 0.0f); + g_hud4_spr = spriteframe("sprites/640hud4.spr", 0, 0.0f); + g_hud5_spr = spriteframe("sprites/640hud5.spr", 0, 0.0f); + g_hud6_spr = spriteframe("sprites/640hud6.spr", 0, 0.0f); + g_hud7_spr = spriteframe("sprites/640hud7.spr", 0, 0.0f); } /* seperator for mainly ammo */ @@ -91,7 +91,7 @@ HUD_DrawSeperator(vector pos) { drawsubpic(pos, [2,24], - HUD_NUMS, + g_hud7_spr, [240/256, 0], [2/256, 24/128], g_hud_color, @@ -106,7 +106,7 @@ HUD_DrawNumber(int iNumber, vector vecPos, float fAlpha, vector vColor) { drawsubpic(vecPos, [24,24], - HUD_NUMS, + g_hud7_spr, [spr_hudnum[iNumber], 0], [NUMSIZE_X, NUMSIZE_Y], vColor, @@ -152,7 +152,7 @@ HUD_DrawHealth(void) drawsubpic( pos + [-72,-4], [32,32], - HUD_NUMS, + g_hud7_spr, [spr_health[0], spr_health[1]], [spr_health[2], spr_health[3]], g_hud_color, @@ -164,7 +164,7 @@ HUD_DrawHealth(void) drawsubpic( pos + [-72,-4], [32,32], - HUD_NUMS, + g_hud7_spr, [spr_health[0], spr_health[1]], [spr_health[2], spr_health[3]], [1,0,0], @@ -199,7 +199,7 @@ HUD_DrawArmor(void) drawsubpic( pos + [-80,-9], [40,40], - HUD_NUMS, + g_hud7_spr, [spr_suit2[0], spr_suit2[1]], [spr_suit2[2], spr_suit2[3]], g_hud_color, @@ -211,7 +211,7 @@ HUD_DrawArmor(void) drawsubpic( pos + [-80,-9], [40, 40 * (pl.armor / 100)], - HUD_NUMS, + g_hud7_spr, [spr_suit1[0], spr_suit1[1]], [spr_suit1[2], spr_suit1[3] * (pl.armor / 100)], @@ -305,7 +305,7 @@ HUD_DrawFlashlight(void) drawsubpic( pos, [32,32], - HUD_NUMS, + g_hud7_spr, [spr_flash1[0], spr_flash1[1]], [spr_flash1[2], spr_flash1[3]], g_hud_color, @@ -316,7 +316,7 @@ HUD_DrawFlashlight(void) drawsubpic( pos, [48,32], - HUD_NUMS, + g_hud7_spr, [spr_flash2[0], spr_flash2[1]], [spr_flash2[2], spr_flash2[3]], g_hud_color, @@ -327,7 +327,7 @@ HUD_DrawFlashlight(void) drawsubpic( pos, [32,32], - HUD_NUMS, + g_hud7_spr, [spr_flash1[0], spr_flash1[1]], [spr_flash1[2], spr_flash1[3]], g_hud_color, diff --git a/src/client/valve/hud_weaponselect.c b/src/client/valve/hud_weaponselect.c index 6b6ada1f..9b5b81f3 100644 --- a/src/client/valve/hud_weaponselect.c +++ b/src/client/valve/hud_weaponselect.c @@ -101,7 +101,7 @@ HUD_DrawWeaponSelect_Last(void) void HUD_DrawWeaponSelect_Num(vector vecPos, float fValue) { - drawsubpic(vecPos, [20,20], "sprites/640hud7.spr_0.tga", g_vecHUDNums[fValue], [20/256, 20/128], g_hud_color, 1, DRAWFLAG_ADDITIVE); + drawsubpic(vecPos, [20,20], g_hud7_spr, g_vecHUDNums[fValue], [20/256, 20/128], g_hud_color, 1, DRAWFLAG_ADDITIVE); } int @@ -205,7 +205,7 @@ HUD_DrawWeaponSelect(void) if (x == wantpos) { // Selected Sprite Weapons_HUDPic(pSeat->m_iHUDWeaponSelected, 1, vecPos, 1.0f); - drawsubpic(vecPos, [170,45], "sprites/640hud3.spr_0.tga", + drawsubpic(vecPos, [170,45], g_hud3_spr, [0,180/256], [170/256,45/256], g_hud_color, 1, DRAWFLAG_ADDITIVE); vecPos[1] += 50; } else if ((b=HUD_InSlotPos(i, x)) != -1) { diff --git a/src/client/valve/scoreboard.c b/src/client/valve/scoreboard.c index cbb6fd34..2e9c14ae 100644 --- a/src/client/valve/scoreboard.c +++ b/src/client/valve/scoreboard.c @@ -82,7 +82,7 @@ Scores_DrawTeam(player pl, vector pos) drawsubpic( pos - [8,0], [32,16], - "sprites/640hud1.spr_0.tga", + g_hud1_spr, [224/256, 240/256], [32/256, 16/256], [1,0,0], diff --git a/src/menu-fn/entry.cpp b/src/menu-fn/entry.cpp index ddbf2c51..e8670f4c 100644 --- a/src/menu-fn/entry.cpp +++ b/src/menu-fn/entry.cpp @@ -120,7 +120,7 @@ m_init(void) } void -Menu_RendererRestarted(void) +Menu_RendererRestarted(string rendererdesc) { localcmd("menu_restart\n"); Menu_AutoScale(); diff --git a/src/shared/scihunt/w_cannon.c b/src/shared/scihunt/w_cannon.c index b2f16e3d..177fa86e 100644 --- a/src/shared/scihunt/w_cannon.c +++ b/src/shared/scihunt/w_cannon.c @@ -14,6 +14,10 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#ifdef CLIENT +var string g_cannon_spr; +#endif + enum { CANNON_FIREBOTH, @@ -37,7 +41,7 @@ void w_cannon_precache(void) #else precache_model("models/v_cannon.mdl"); precache_model("models/p_cannon.mdl"); - precache_model("sprites/w_cannon.spr"); + g_cannon_spr = spriteframe("sprites/w_cannon.spr", 0, 0.0f); #endif } void w_cannon_updateammo(player pl) @@ -208,11 +212,11 @@ void w_cannon_crosshair(void) #ifdef CLIENT static vector cross_pos; cross_pos = (g_hudres / 2) + [-12,-12]; - drawsubpic(cross_pos, [24,24], "sprites/crosshairs.spr_0.tga", [48/128,24/128], [0.1875, 0.1875], [1,1,1], 1, DRAWFLAG_NORMAL); + drawsubpic(cross_pos, [24,24], g_cross_spr, [48/128,24/128], [0.1875, 0.1875], [1,1,1], 1, DRAWFLAG_NORMAL); HUD_DrawAmmo1(); HUD_DrawAmmo2(); vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42]; - drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [72/256,72/128], [24/256, 24/128], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE); + drawsubpic(aicon_pos, [24,24], g_hud7_spr, [72/256,72/128], [24/256, 24/128], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE); #endif } @@ -225,9 +229,9 @@ void w_cannon_hudpic(int s, vector pos, float a) { #ifdef CLIENT if (s) { - drawsubpic(pos, [170,45], "sprites/w_cannon.spr_0.tga", [0,48/256], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); + drawsubpic(pos, [170,45], g_cannon_spr, [0,48/256], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); } else { - drawsubpic(pos, [170,45], "sprites/w_cannon.spr_0.tga", [0,0], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); + drawsubpic(pos, [170,45], g_cannon_spr, [0,0], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); } #endif } diff --git a/src/shared/scihunt/w_chainsaw.c b/src/shared/scihunt/w_chainsaw.c index 58dc8929..a6f07b70 100644 --- a/src/shared/scihunt/w_chainsaw.c +++ b/src/shared/scihunt/w_chainsaw.c @@ -14,6 +14,10 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#ifdef CLIENT +var string g_chainsaw_spr; +#endif + enum { CHAINSAW_STARTFIRE, @@ -37,7 +41,7 @@ void w_chainsaw_precache(void) #else precache_model("models/v_chainsaw.mdl"); precache_model("models/p_saw.mdl"); - precache_model("sprites/chainsaw.spr"); + g_chainsaw_spr = spriteframe("sprites/chainsaw.spr", 0, 0.0f); #endif } @@ -144,11 +148,11 @@ void w_chainsaw_hudpic(int s, vector pos, float a) { #ifdef CLIENT if (s) { - drawsubpic(pos, [170,45], "sprites/chainsaw.spr_0.tga", + drawsubpic(pos, [170,45], g_chainsaw_spr, [0,48/256], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); } else { - drawsubpic(pos, [170,45], "sprites/chainsaw.spr_0.tga", + drawsubpic(pos, [170,45], g_chainsaw_spr, [0,0], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); } diff --git a/src/shared/scihunt/w_hammer.c b/src/shared/scihunt/w_hammer.c index 70a2eaa2..15a29906 100644 --- a/src/shared/scihunt/w_hammer.c +++ b/src/shared/scihunt/w_hammer.c @@ -14,6 +14,10 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#ifdef CLIENT +var string g_hammer_spr; +#endif + enum { HAMMER_IDLE1, @@ -38,7 +42,7 @@ void w_hammer_precache(void) #else precache_model("models/p_hammer.mdl"); precache_model("models/v_hammer.mdl"); - precache_model("sprites/hammer.spr"); + g_hammer_spr = spriteframe("sprites/hammer.spr", 0, 0.0f); #endif } @@ -210,9 +214,9 @@ void w_hammer_hudpic(int s, vector pos, float a) { #ifdef CLIENT if (s) { - drawsubpic(pos, [170,45], "sprites/hammer.spr_0.tga", [0,48/256], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); + drawsubpic(pos, [170,45], g_hammer_spr, [0,48/256], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); } else { - drawsubpic(pos, [170,45], "sprites/hammer.spr_0.tga", [0,0], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); + drawsubpic(pos, [170,45], g_hammer_spr, [0,0], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); } #endif } diff --git a/src/shared/valve/w_crossbow.c b/src/shared/valve/w_crossbow.c index 87d9a803..0a50214a 100644 --- a/src/shared/valve/w_crossbow.c +++ b/src/shared/valve/w_crossbow.c @@ -301,7 +301,7 @@ w_crossbow_crosshair(void) drawsubpic( cross_pos, [24,24], - "sprites/crosshairs.spr_0.tga", + g_cross_spr, [72/128,0], [0.1875, 0.1875], [1,1,1], @@ -316,7 +316,7 @@ w_crossbow_crosshair(void) drawsubpic( aicon_pos, [24,24], - "sprites/640hud7.spr_0.tga", + g_hud7_spr, [96/256,72/128], [24/256, 24/128], g_hud_color, @@ -340,7 +340,7 @@ w_crossbow_hudpic(int selected, vector pos, float a) drawsubpic( pos, [170,45], - "sprites/640hud5.spr_0.tga", + g_hud5_spr, [0,0], [170/256,45/256], g_hud_color, @@ -351,7 +351,7 @@ w_crossbow_hudpic(int selected, vector pos, float a) drawsubpic( pos, [170,45], - "sprites/640hud2.spr_0.tga", + g_hud2_spr, [0,0], [170/256,45/256], g_hud_color, diff --git a/src/shared/valve/w_crowbar.c b/src/shared/valve/w_crowbar.c index 00654166..3efad79c 100644 --- a/src/shared/valve/w_crowbar.c +++ b/src/shared/valve/w_crowbar.c @@ -185,7 +185,7 @@ w_crowbar_hudpic(int selected, vector pos, float a) drawsubpic( pos, [170,45], - "sprites/640hud4.spr_0.tga", + g_hud4_spr, [0,0], [170/256,45/256], g_hud_color, @@ -196,7 +196,7 @@ w_crowbar_hudpic(int selected, vector pos, float a) drawsubpic( pos, [170,45], - "sprites/640hud1.spr_0.tga", + g_hud1_spr, [0,0], [170/256,45/256], g_hud_color, diff --git a/src/shared/valve/w_egon.c b/src/shared/valve/w_egon.c index 77615827..93c93963 100644 --- a/src/shared/valve/w_egon.c +++ b/src/shared/valve/w_egon.c @@ -165,10 +165,10 @@ void w_egon_crosshair(void) #ifdef CLIENT static vector cross_pos; cross_pos = g_hudmins + (g_hudres / 2) + [-12,-12]; - drawsubpic(cross_pos, [24,24], "sprites/crosshairs.spr_0.tga", [72/128,48/128], [0.1875, 0.1875], [1,1,1], 1, DRAWFLAG_NORMAL); + drawsubpic(cross_pos, [24,24], g_cross_spr, [72/128,48/128], [0.1875, 0.1875], [1,1,1], 1, DRAWFLAG_NORMAL); HUD_DrawAmmo2(); vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42]; - drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [0,96/128], [24/256, 24/128], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE); + drawsubpic(aicon_pos, [24,24], g_hud7_spr, [0,96/128], [24/256, 24/128], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE); #endif } @@ -181,9 +181,9 @@ void w_egon_hudpic(int selected, vector pos, float a) { #ifdef CLIENT if (selected) { - drawsubpic(pos, [170,45], "sprites/640hud5.spr_0.tga", [0,135/256], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); + drawsubpic(pos, [170,45], g_hud5_spr, [0,135/256], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); } else { - drawsubpic(pos, [170,45], "sprites/640hud2.spr_0.tga", [0,135/256], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); + drawsubpic(pos, [170,45], g_hud2_spr, [0,135/256], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); } #endif } diff --git a/src/shared/valve/w_gauss.c b/src/shared/valve/w_gauss.c index ac2f4c39..19dd39ea 100644 --- a/src/shared/valve/w_gauss.c +++ b/src/shared/valve/w_gauss.c @@ -408,7 +408,7 @@ void w_gauss_crosshair(void) drawsubpic( cross_pos, [24,24], - "sprites/crosshairs.spr_0.tga", + g_cross_spr, [48/128,48/128], [0.1875, 0.1875], [1,1,1], @@ -419,7 +419,7 @@ void w_gauss_crosshair(void) drawsubpic( aicon_pos, [24,24], - "sprites/640hud7.spr_0.tga", + g_hud7_spr, [0,96/128], [24/256,24/128], g_hud_color, @@ -443,7 +443,7 @@ void w_gauss_hudpic(int selected, vector pos, float a) drawsubpic( pos, [170,45], - "sprites/640hud5.spr_0.tga", + g_hud5_spr, [0,90/256], [170/256,45/256], g_hud_color, @@ -454,7 +454,7 @@ void w_gauss_hudpic(int selected, vector pos, float a) drawsubpic( pos, [170,45], - "sprites/640hud2.spr_0.tga", + g_hud2_spr, [0,90/256], [170/256,45/256], g_hud_color, diff --git a/src/shared/valve/w_glock.c b/src/shared/valve/w_glock.c index 8e97b894..c9c5680b 100644 --- a/src/shared/valve/w_glock.c +++ b/src/shared/valve/w_glock.c @@ -295,7 +295,7 @@ w_glock_hud(void) drawsubpic( cross_pos, [24,24], - "sprites/crosshairs.spr_0.tga", + g_cross_spr, [0.1875,0], [0.1875, 0.1875], [1,1,1], @@ -309,7 +309,7 @@ w_glock_hud(void) drawsubpic( aicon_pos, [24,24], - "sprites/640hud7.spr_0.tga", + g_hud7_spr, [0,72/128], [24/256, 24/128], g_hud_color, @@ -327,7 +327,7 @@ w_glock_hudpic(int selected, vector pos, float a) drawsubpic( pos, [170,45], - "sprites/640hud4.spr_0.tga", + g_hud4_spr, [0,45/256], [170/256,45/256], g_hud_color, @@ -338,7 +338,7 @@ w_glock_hudpic(int selected, vector pos, float a) drawsubpic( pos, [170,45], - "sprites/640hud1.spr_0.tga", + g_hud1_spr, [0,45/256], [170/256,45/256], g_hud_color, diff --git a/src/shared/valve/w_handgrenade.c b/src/shared/valve/w_handgrenade.c index 96955d70..38c3b869 100644 --- a/src/shared/valve/w_handgrenade.c +++ b/src/shared/valve/w_handgrenade.c @@ -182,7 +182,7 @@ void w_handgrenade_hud(void) #ifdef CLIENT HUD_DrawAmmo2(); vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42]; - drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [48/256,96/128], [24/256, 24/128], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE); + drawsubpic(aicon_pos, [24,24], g_hud7_spr, [48/256,96/128], [24/256, 24/128], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE); #endif } @@ -239,9 +239,9 @@ w_handgrenade_hudpic(int selected, vector pos, float a) { #ifdef CLIENT if (selected) { - drawsubpic(pos, [170,45], "sprites/640hud6.spr_0.tga", [0,0], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); + drawsubpic(pos, [170,45], g_hud6_spr, [0,0], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); } else { - drawsubpic(pos, [170,45], "sprites/640hud3.spr_0.tga", [0,0], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); + drawsubpic(pos, [170,45], g_hud3_spr, [0,0], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); } #endif } diff --git a/src/shared/valve/w_hornetgun.c b/src/shared/valve/w_hornetgun.c index 044b49ce..1eeb35f3 100644 --- a/src/shared/valve/w_hornetgun.c +++ b/src/shared/valve/w_hornetgun.c @@ -262,7 +262,7 @@ w_hornetgun_crosshair(void) drawsubpic( cross_pos, [24,24], - "sprites/crosshairs.spr_0.tga", + g_cross_spr, [72/128,24/128], [0.1875, 0.1875], [1,1,1], @@ -275,7 +275,7 @@ w_hornetgun_crosshair(void) drawsubpic( aicon_pos, [24,24], - "sprites/640hud7.spr_0.tga", + g_hud7_spr, [24/256,96/128], [24/256, 24/128], g_hud_color, @@ -299,7 +299,7 @@ w_hornetgun_hudpic(int selected, vector pos, float a) drawsubpic( pos, [170,45], - "sprites/640hud5.spr_0.tga", + g_hud5_spr, [0,180/256], [170/256,45/256], g_hud_color, @@ -310,7 +310,7 @@ w_hornetgun_hudpic(int selected, vector pos, float a) drawsubpic( pos, [170,45], - "sprites/640hud2.spr_0.tga", + g_hud2_spr, [0,180/256], [170/256,45/256], g_hud_color, diff --git a/src/shared/valve/w_mp5.c b/src/shared/valve/w_mp5.c index ae95e4f8..1f4dcba5 100644 --- a/src/shared/valve/w_mp5.c +++ b/src/shared/valve/w_mp5.c @@ -296,7 +296,7 @@ w_mp5_crosshair(void) drawsubpic( cross_pos, [24,24], - "sprites/crosshairs.spr_0.tga", + g_cross_spr, [24/128,48/128], [0.1875, 0.1875], [1,1,1], @@ -312,7 +312,7 @@ w_mp5_crosshair(void) drawsubpic( aicon_pos, [24,24], - "sprites/640hud7.spr_0.tga", + g_hud7_spr, [0,72/128], [24/256, 24/128], g_hud_color, @@ -324,7 +324,7 @@ w_mp5_crosshair(void) drawsubpic( aicon_pos, [24,24], - "sprites/640hud7.spr_0.tga", + g_hud7_spr, [48/256,72/128], [24/256, 24/128], g_hud_color, @@ -348,7 +348,7 @@ w_mp5_hudpic(int selected, vector pos, float a) drawsubpic( pos, [170,45], - "sprites/640hud4.spr_0.tga", + g_hud4_spr, [0,135/256], [170/256,45/256], g_hud_color, @@ -359,7 +359,7 @@ w_mp5_hudpic(int selected, vector pos, float a) drawsubpic( pos, [170,45], - "sprites/640hud1.spr_0.tga", + g_hud1_spr, [0,135/256], [170/256,45/256], g_hud_color, diff --git a/src/shared/valve/w_python.c b/src/shared/valve/w_python.c index 66ff51cc..e1cce7bf 100644 --- a/src/shared/valve/w_python.c +++ b/src/shared/valve/w_python.c @@ -267,7 +267,7 @@ w_python_crosshair(void) drawsubpic( cross_pos, [24,24], - "sprites/crosshairs.spr_0.tga", + g_cross_spr, [48/128,0], [0.1875, 0.1875], [1,1,1], @@ -282,7 +282,7 @@ w_python_crosshair(void) drawsubpic( aicon_pos, [24,24], - "sprites/640hud7.spr_0.tga", + g_hud7_spr, [24/256,72/128], [24/256, 24/128], g_hud_color, @@ -306,7 +306,7 @@ w_python_hudpic(int selected, vector pos, float a) drawsubpic( pos, [170,45], - "sprites/640hud4.spr_0.tga", + g_hud4_spr, [0,90/256], [170/256,45/256], g_hud_color, @@ -317,7 +317,7 @@ w_python_hudpic(int selected, vector pos, float a) drawsubpic( pos, [170,45], - "sprites/640hud1.spr_0.tga", + g_hud1_spr, [0,90/256], [170/256,45/256], g_hud_color, diff --git a/src/shared/valve/w_rpg.c b/src/shared/valve/w_rpg.c index 8b64f652..82dcb315 100644 --- a/src/shared/valve/w_rpg.c +++ b/src/shared/valve/w_rpg.c @@ -272,9 +272,9 @@ void w_rpg_hudpic(int selected, vector pos, float a) { #ifdef CLIENT if (selected) { - drawsubpic(pos, [170,45], "sprites/640hud5.spr_0.tga", [0,45/256], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); + drawsubpic(pos, [170,45], g_hud5_spr, [0,45/256], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); } else { - drawsubpic(pos, [170,45], "sprites/640hud2.spr_0.tga", [0,45/256], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); + drawsubpic(pos, [170,45], g_hud2_spr, [0,45/256], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); } #endif } @@ -300,7 +300,7 @@ void w_rpg_hud(void) drawsubpic( cross_pos + jitter, [lerp,lerp], - "sprites/laserdot.spr_0.tga", + g_laser_spr, [0,0], [1.0, 1.0], [1,1,1], @@ -312,7 +312,7 @@ void w_rpg_hud(void) drawsubpic( cross_pos, [24,24], - "sprites/crosshairs.spr_0.tga", + g_cross_spr, [0,0], [0.1875, 0.1875], [1,1,1], diff --git a/src/shared/valve/w_satchel.c b/src/shared/valve/w_satchel.c index 9607eaba..30634481 100644 --- a/src/shared/valve/w_satchel.c +++ b/src/shared/valve/w_satchel.c @@ -257,7 +257,7 @@ void w_satchel_hud(void) #ifdef CLIENT HUD_DrawAmmo2(); vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42]; - drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [72/256,96/128], [24/256, 24/128], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE); + drawsubpic(aicon_pos, [24,24], g_hud7_spr, [72/256,96/128], [24/256, 24/128], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE); #endif } @@ -265,9 +265,9 @@ void w_satchel_hudpic(int selected, vector pos, float a) { #ifdef CLIENT if (selected) { - drawsubpic(pos, [170,45], "sprites/640hud6.spr_0.tga", [0,45/256], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); + drawsubpic(pos, [170,45], g_hud6_spr, [0,45/256], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); } else { - drawsubpic(pos, [170,45], "sprites/640hud3.spr_0.tga", [0,45/256], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); + drawsubpic(pos, [170,45], g_hud3_spr, [0,45/256], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); } #endif } diff --git a/src/shared/valve/w_shotgun.c b/src/shared/valve/w_shotgun.c index 913b7d5e..6bb83a85 100644 --- a/src/shared/valve/w_shotgun.c +++ b/src/shared/valve/w_shotgun.c @@ -275,11 +275,11 @@ void w_shotgun_crosshair(void) #ifdef CLIENT static vector cross_pos; cross_pos = g_hudmins + (g_hudres / 2) + [-12,-12]; - drawsubpic(cross_pos, [24,24], "sprites/crosshairs.spr_0.tga", [48/128,24/128], [0.1875, 0.1875], [1,1,1], 1, DRAWFLAG_NORMAL); + drawsubpic(cross_pos, [24,24], g_cross_spr, [48/128,24/128], [0.1875, 0.1875], [1,1,1], 1, DRAWFLAG_NORMAL); HUD_DrawAmmo1(); HUD_DrawAmmo2(); vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42]; - drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [72/256,72/128], [24/256, 24/128], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE); + drawsubpic(aicon_pos, [24,24], g_hud7_spr, [72/256,72/128], [24/256, 24/128], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE); #endif } @@ -292,9 +292,9 @@ void w_shotgun_hudpic(int selected, vector pos, float a) { #ifdef CLIENT if (selected) { - drawsubpic(pos, [170,45], "sprites/640hud4.spr_0.tga", [0,180/256], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); + drawsubpic(pos, [170,45], g_hud4_spr, [0,180/256], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); } else { - drawsubpic(pos, [170,45], "sprites/640hud1.spr_0.tga", [0,180/256], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); + drawsubpic(pos, [170,45], g_hud1_spr, [0,180/256], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); } #endif } diff --git a/src/shared/valve/w_snark.c b/src/shared/valve/w_snark.c index 8804a013..740b07bc 100644 --- a/src/shared/valve/w_snark.c +++ b/src/shared/valve/w_snark.c @@ -283,7 +283,7 @@ void w_snark_hud(void) #ifdef CLIENT HUD_DrawAmmo2(); vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42]; - drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [96/256,96/128], [24/256, 24/128], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE); + drawsubpic(aicon_pos, [24,24], g_hud7_spr, [96/256,96/128], [24/256, 24/128], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE); #endif } @@ -291,11 +291,11 @@ void w_snark_hudpic(int selected, vector pos, float a) { #ifdef CLIENT if (selected) { - drawsubpic(pos, [170,45], "sprites/640hud6.spr_0.tga", + drawsubpic(pos, [170,45], g_hud6_spr, [0,135/256], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); } else { - drawsubpic(pos, [170,45], "sprites/640hud3.spr_0.tga", + drawsubpic(pos, [170,45], g_hud3_spr, [0,135/256], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); } diff --git a/src/shared/valve/w_tripmine.c b/src/shared/valve/w_tripmine.c index f99d7d75..117e0a8b 100644 --- a/src/shared/valve/w_tripmine.c +++ b/src/shared/valve/w_tripmine.c @@ -325,7 +325,7 @@ void w_tripmine_hud(void) #ifdef CLIENT HUD_DrawAmmo2(); vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42]; - drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [120/256,96/128], [24/256, 24/128], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE); + drawsubpic(aicon_pos, [24,24], g_hud7_spr, [120/256,96/128], [24/256, 24/128], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE); #endif } @@ -333,9 +333,9 @@ void w_tripmine_hudpic(int selected, vector pos, float a) { #ifdef CLIENT if (selected) { - drawsubpic(pos, [170,45], "sprites/640hud6.spr_0.tga", [0,90/256], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); + drawsubpic(pos, [170,45], g_hud6_spr, [0,90/256], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); } else { - drawsubpic(pos, [170,45], "sprites/640hud3.spr_0.tga", [0,90/256], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); + drawsubpic(pos, [170,45], g_hud3_spr, [0,90/256], [170/256,45/256], g_hud_color, a, DRAWFLAG_ADDITIVE); } #endif }