From c459e918af4a4e1de4742a21600419ea1646eda3 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 29 Jan 2024 22:01:16 +0100 Subject: [PATCH] prep some speedometer stuff --- src/d_main.c | 11 ++++++++--- src/d_main.h | 3 ++- src/k_kart.c | 30 +++++++++++++++++++++++------- src/m_menu.c | 6 +++--- 4 files changed, 36 insertions(+), 14 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index 1657fe043..e6f22465d 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1077,7 +1077,8 @@ static boolean AddIWAD(void) boolean found_extra_kart; boolean found_extra2_kart; -boolean snw_speedo; // snowy speedometer check +boolean xtra_speedo; // extra speedometer check +//boolean achi_speedo; // achiiro speedometer check boolean clr_hud; // colour hud check boolean big_lap; // bigger lap counter boolean big_lap_color; // bigger lap counter but colour @@ -1444,9 +1445,13 @@ void D_SRB2Main(void) if (found_extra2_kart) mainwads++; - // now check for speedometer stuff + // now check for extra speedometer stuff if (W_CheckMultipleLumps("SP_SMSTC", "K_TRNULL", "SP_MKMH", "SP_MMPH", "SP_MFRAC", "SP_MPERC", NULL)) - snw_speedo = true; + xtra_speedo = true; + + // now check for achii speedometer stuff + //if (W_CheckMultipleLumps("SP_SMSTC", "K_TRNULL", "SP_MKMH", "SP_MMPH", "SP_MFRAC", "SP_MPERC", NULL)) + //achi_speedo = true; // check for bigger lap count if (W_CheckMultipleLumps("K_STLAPB", "K_STLA2B", NULL)) diff --git a/src/d_main.h b/src/d_main.h index 4214e06a4..e524f224b 100644 --- a/src/d_main.h +++ b/src/d_main.h @@ -28,7 +28,8 @@ extern char srb2path[256]; //Alam: SRB2's Home extern boolean found_extra_kart; // for use in k_kart.c extern boolean found_extra2_kart; // for use in k_kart.c -extern boolean snw_speedo; // snowy speedometer check +extern boolean xtra_speedo; // extra speedometer check +//boolean achi_speedo; // achiiro speedometer 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 a8c9c1fd2..069d66ca4 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -7040,7 +7040,7 @@ void K_LoadKartHUDGraphics(void) kp_splitkarmabomb = W_CachePatchName("K_SPTKRM", PU_HUDGFX); kp_timeoutsticker = W_CachePatchName("K_STTOUT", PU_HUDGFX); - if (snw_speedo) // snowy speedometer + if (xtra_speedo) // snowy speedometer { skp_smallsticker = W_CachePatchName("SP_SMSTC", PU_HUDGFX); skp_speedpatches[0] = W_CachePatchName("K_TRNULL", PU_HUDGFX); // lolxd @@ -7078,7 +7078,7 @@ void K_LoadKartHUDGraphics(void) kp_lapstickerbig2clr = W_CachePatchName("K_SCLA2B", PU_HUDGFX); } - if (snw_speedo) + if (xtra_speedo) skp_smallstickerclr = W_CachePatchName("SC_SMSTC", PU_HUDGFX); } @@ -7628,7 +7628,7 @@ static void K_drawKartStats(void) //Internal offset for speedometer if (cv_kartspeedometer.value) { - if (cv_newspeedometer.value == 2 && snw_speedo) + if (cv_newspeedometer.value == 2 && xtra_speedo) spdoffset = -10; else spdoffset = -14; @@ -8681,7 +8681,7 @@ static void K_drawKartSpeedometer(void) } // man. - if ((cv_newspeedometer.value == 1) || (cv_newspeedometer.value == 2 && !snw_speedo) || (cv_newspeedometer.value == 3 && !kartzspeedo)) + if ((cv_newspeedometer.value == 1) || (cv_newspeedometer.value == 2 && !xtra_speedo) || (cv_newspeedometer.value == 3 && !kartzspeedo)) { switch (speedtype) { case 1: @@ -8694,7 +8694,7 @@ static void K_drawKartSpeedometer(void) V_DrawKartString(SPDM_X, SPDM_Y, V_HUDTRANS|splitflags, va("%3d fu/t", convSpeed)); break; case 4: // if extra.kart is found, use its included % symbol - if (!snw_speedo) + if (!xtra_speedo) V_DrawKartString(SPDM_X, SPDM_Y, V_HUDTRANS|splitflags, va("%4d P", convSpeed)); else V_DrawKartString(SPDM_X, SPDM_Y, V_HUDTRANS|splitflags, va("%4d %%", convSpeed)); @@ -8703,7 +8703,23 @@ static void K_drawKartSpeedometer(void) break; } } - else if (cv_newspeedometer.value == 2 && snw_speedo) // why bother if we dont? + 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)<