From f6613a5555493dec993ef07332e077de6201c729 Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 9 Feb 2024 12:35:48 +0100 Subject: [PATCH] proper check for colourized speedometer patches --- src/d_main.c | 10 +++++++++- src/d_main.h | 2 ++ src/k_kart.c | 33 +++++++++++++++------------------ 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index 68a080251..ea3992ae7 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1079,7 +1079,9 @@ boolean found_extra_kart; boolean found_extra2_kart; boolean xtra_speedo; // extra speedometer check +boolean xtra_speedo_clr; // extra speedometer colour check boolean achi_speedo; // achiiro speedometer check +boolean achi_speedo_clr; // extra speedometer colour check boolean clr_hud; // colour hud check boolean big_lap; // bigger lap counter boolean big_lap_color; // bigger lap counter but colour @@ -1451,9 +1453,15 @@ void D_SRB2Main(void) if (W_CheckMultipleLumps("SP_SMSTC", "K_TRNULL", "SP_MKMH", "SP_MMPH", "SP_MFRAC", "SP_MPERC", NULL)) xtra_speedo = true; + if (W_CheckMultipleLumps("SC_SMSTC", NULL)) + xtra_speedo_clr = true; + // now check for achii speedometer stuff if (W_CheckMultipleLumps("SP_AMSTC", "K_TRNULL", "SP_AKMH", "SP_AMPH", "SP_AFRAC", "SP_APERC", NULL)) achi_speedo = true; + + if (W_CheckMultipleLumps("SC_AMSTC", "K_TRNULL", "SC_AKMH", "SC_AMPH", "SC_AFRAC", "SC_APERC", NULL)) + achi_speedo_clr = true; // check for bigger lap count if (W_CheckMultipleLumps("K_STLAPB", "K_STLA2B", NULL)) @@ -1461,7 +1469,7 @@ void D_SRB2Main(void) // now check for colour hud stuff if (W_CheckMultipleLumps("K_SCTIME", "K_SCTIMW", "K_SCLAPS", "K_SCLAPW", \ - "K_SCBALN", "K_SCBALW", "K_SCKARM", "K_SCTOUT", "K_ISMULC", "K_ITMULC", "K_ITBC","K_ITBCD", "K_ISBC", "K_ISBCD", NULL)) + "K_SCBALN", "K_SCBALW", "K_SCKARM", "K_SCTOUT", "K_ISMULC", "K_ITMULC", "K_ITBC", "K_ITBCD", "K_ISBC", "K_ISBCD", NULL)) clr_hud = true; // check for bigger lap count but color** its color bitch diff --git a/src/d_main.h b/src/d_main.h index 544926c51..aa092ab13 100644 --- a/src/d_main.h +++ b/src/d_main.h @@ -30,7 +30,9 @@ extern boolean found_extra2_kart; // for use in k_kart.c // extra graphic patches for saturn specific thingies extern boolean xtra_speedo; // extra speedometer check +extern boolean xtra_speedo_clr; // extra speedometer colour check extern boolean achi_speedo; // achiiro speedometer check +extern boolean achi_speedo_clr; // extra speedometer colour check extern boolean clr_hud; // colour hud check extern boolean big_lap; // bigger lap counter extern boolean big_lap_color; // bigger lap counter but colour diff --git a/src/k_kart.c b/src/k_kart.c index fac828e5f..11479027e 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -7080,10 +7080,9 @@ void K_LoadKartHUDGraphics(void) skp_speedpatchesachi[4] = W_CachePatchName("SP_APERC", PU_HUDGFX); } - // bigger lap gfx for many laps - if (big_lap){ - kp_lapstickerbig = W_CachePatchName("K_STLAPB", PU_HUDGFX); - kp_lapstickerbig2 = W_CachePatchName("K_STLA2B", PU_HUDGFX); + if (big_lap){ + kp_lapstickerbig = W_CachePatchName("K_STLAPB", PU_HUDGFX); + kp_lapstickerbig2 = W_CachePatchName("K_STLA2B", PU_HUDGFX); } // Colourized hud @@ -7109,10 +7108,10 @@ void K_LoadKartHUDGraphics(void) kp_lapstickerbig2clr = W_CachePatchName("K_SCLA2B", PU_HUDGFX); } - if (xtra_speedo) + if (xtra_speedo && xtra_speedo_clr) skp_smallstickerclr = W_CachePatchName("SC_SMSTC", PU_HUDGFX); - if (achi_speedo) + if (achi_speedo && achi_speedo_clr) { skp_smallstickerachiclr = W_CachePatchName("SC_AMSTC", PU_HUDGFX); skp_speedpatchesachiclr[0] = W_CachePatchName("K_TRNULL", PU_HUDGFX); // lolxd @@ -8752,15 +8751,13 @@ static void K_drawKartSpeedometer(void) } else if (cv_newspeedometer.value == 2 && xtra_speedo) // why bother if we dont? { - if (!K_UseColorHud()) - //V_DrawScaledPatch(SPDM_X + 1, SPDM_Y + 4, (V_HUDTRANS|splitflags), (skp_smallsticker)); - V_DrawStretchyFixedPatch((SPDM_X-1)<