From c343c524772c8a63ce1f9523006ca71a11de4439 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 23 Apr 2026 10:07:35 +0200 Subject: [PATCH] remove "extra3" hud stuff decided to finally make smol stickers for the beta hud this was never a really great solution since it made things look pretty bad at certain resolutions/scales still keep the loading code for convenience but honestly not needed aswell at this point --- src/d_main.c | 17 ------------- src/d_main.h | 2 -- src/k_hud.c | 69 ++++++---------------------------------------------- src/k_kart.c | 3 ++- 4 files changed, 10 insertions(+), 81 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index 9443c0a47..eb503b39f 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1416,8 +1416,6 @@ static inline void D_MakeTitleString(char *s) // extra graphic patches for saturn specific thingies boolean xtra_speedo = false; // extra speedometer check boolean xtra_speedo_clr = false; // extra speedometer colour check -boolean xtra_speedo3 = false; // 80x 11 extra speedometer check -boolean xtra_speedo_clr3 = false; // 80x 11 extra speedometer colour check boolean achi_speedo = false; // achiiro speedometer check boolean achi_speedo_clr = false; // extra speedometer colour check boolean dial_speedo = false; // dial speedometer check @@ -1447,7 +1445,6 @@ static void D_CheckSaturnExtraFiles(void) CV_PossibleValue_t minimapdot_cons_temp[NUMMINIMAPDOTSTUFF] = {{0, "Off"}, {0, NULL}, {0, NULL}, {0, NULL}, {0, NULL}}; unsigned last_speedo_i = 0; - unsigned last_driftgauge_i = 3; unsigned last_inputdisplay_i = 2; unsigned last_minimapdot_i = 0; #define PUSHCONS(cons, i, id, name) { ++i; cons[i].value = id; cons[i].strvalue = name; } @@ -1606,20 +1603,6 @@ static void D_CheckSaturnExtraFiles(void) if (found_extra3_kart) { mainwads++; - - // 80x11 speedometer crap - if (W_LumpExists("SP_SM3TC")) - { - xtra_speedo3 = true; - PUSHCONS(speedo_cons_temp, last_speedo_i, 7, "Extra"); - PUSHCONS(driftgaugestyle_cons_temp, last_driftgauge_i, 5, "Extra"); - } - - // 80x11 speedometer crap but colour - if (W_LumpExists("SC_SM3TC")) - { - xtra_speedo_clr3 = true; - } } #undef PUSHCONS diff --git a/src/d_main.h b/src/d_main.h index 8f1475706..8bbf79df0 100644 --- a/src/d_main.h +++ b/src/d_main.h @@ -38,8 +38,6 @@ extern boolean found_extra3_kart; // for use in k_kart.c extern boolean xtra_speedo; // extra speedometer check extern boolean xtra_speedo_clr; // extra speedometer colour check -extern boolean xtra_speedo3; // 80x11 extra speedometer check -extern boolean xtra_speedo_clr3; // 80x11 extra speedometer colour check extern boolean achi_speedo; // achiiro speedometer check extern boolean achi_speedo_clr; // extra speedometer colour check extern boolean dial_speedo; // dial speedometer check diff --git a/src/k_hud.c b/src/k_hud.c index ce60d23c8..4e2f6477f 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -274,7 +274,6 @@ void K_RegisterKartHudStuff(void) // Smol speedo static patch_t *skp_smallsticker = NULL; -static patch_t *skp_smallsticker3 = NULL; static patch_t *skp_speedpatches[5] = {NULL}; @@ -312,7 +311,6 @@ static patch_t *kp_bumperstickerwideclr = NULL; static patch_t *kp_karmastickerclr = NULL; static patch_t *kp_timeoutstickerclr = NULL; static patch_t *skp_smallstickerclr = NULL; -static patch_t *skp_smallstickerclr3 = NULL; static patch_t *kp_itemmulstickerclr[2] = {NULL}; static patch_t *kp_itembgclr[4] = {NULL}; @@ -478,11 +476,6 @@ static void K_LoadSaturnHUDGraphics(void) skp_smallstickerclr = (patch_t *)W_CachePatchName("SC_SMSTC", PU_HUDGFX); } - if (xtra_speedo_clr3) - { - skp_smallstickerclr3 = (patch_t *)W_CachePatchName("SC_SM3TC", PU_HUDGFX); - } - if (achi_speedo_clr) { skp_smallstickerachiclr = (patch_t *)W_CachePatchName("SC_AMSTC", PU_HUDGFX); @@ -537,14 +530,6 @@ static void K_LoadSaturnHUDGraphics(void) kp_itemmulstickerclr[0] = (patch_t *)W_CachePatchName("K_ITMULC", PU_HUDGFX); } } - - if (found_extra3_kart) - { - if (xtra_speedo3) // 80x11 patch scaled to size - { - skp_smallsticker3 = (patch_t *)W_CachePatchName("SP_SM3TC", PU_HUDGFX); - } - } } // -- Kart patches -- @@ -879,7 +864,7 @@ void K_LoadKartHUDGraphics(void) kp_yougotem = (patch_t *)W_CachePatchName("YOUGOTEM", PU_HUDGFX); - if (found_extra_kart || found_extra2_kart || found_extra3_kart) + if (found_extra_kart || found_extra2_kart) K_LoadSaturnHUDGraphics(); } @@ -1149,7 +1134,6 @@ enum SPEEDO_DIAL, SPEEDO_PMETER, SPEEDO_PMETERSMOL, - SPEEDO_EXTRA3, }; static SINT8 K_GetSpeedometerStyle(void) @@ -1164,8 +1148,6 @@ static SINT8 K_GetSpeedometerStyle(void) return SPEEDO_PMETER; else if (cv_newspeedometer.value == 6 && kartz_speedo_smol) return SPEEDO_PMETERSMOL; - else if (cv_newspeedometer.value == 7 && xtra_speedo3) - return SPEEDO_EXTRA3; else return SPEEDO_VANILLA; } @@ -1183,8 +1165,6 @@ static boolean K_UseColorSpeedo(int speedostyle) return achi_speedo_clr; case SPEEDO_DIAL: return dial_speedo_clr; - case SPEEDO_EXTRA3: - return xtra_speedo_clr3; default: return false; } @@ -1196,7 +1176,6 @@ enum GAUGE_SMALL, GAUGE_BIGNUM, GAUGE_NUMONLY, - GAUGE_EXTRA, }; static SINT8 K_GetDriftgaugeStyle(void) @@ -1209,8 +1188,6 @@ static SINT8 K_GetDriftgaugeStyle(void) return GAUGE_SMALL; else if (cv_driftgaugestyle.value == 3) return GAUGE_BIGNUM; - else if (cv_driftgaugestyle.value == 5 && xtra_speedo3) - return GAUGE_EXTRA; } // Fallback @@ -1409,7 +1386,6 @@ static void K_drawKartStats(void) { case SPEEDO_EXTRA: case SPEEDO_ACHII: - case SPEEDO_EXTRA3: spdoffset = -10; break; case SPEEDO_DIAL: @@ -2748,19 +2724,6 @@ static void K_drawKartSpeedometer(void) (K_UseColorSpeedo(SPEEDO_DIAL))); } #endif - else if (speedostyle == SPEEDO_EXTRA3) // why bother if we dont? - { - if (K_UseColorSpeedo(SPEEDO_EXTRA3)) //Colourized hud - { - UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE); - V_DrawStretchyFixedPatch((SPDM_X-1)<= driftval*4) // rainbow sparks { diff --git a/src/k_kart.c b/src/k_kart.c index b87894dae..5d8b9b37c 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -6225,7 +6225,8 @@ void K_KartUpdatePosition(player_t *player) players[i].kartstuff[k_prevcheck] += imo; ipcd++; } - if (isnextcheckpointi ) + + if (isnextcheckpointi) { players[i].kartstuff[k_nextcheck] += imo; incd++;