prep some speedometer stuff

This commit is contained in:
Alug committed 2024-01-29 22:01:16 +01:00
1 parent 962abba1b2
commit c459e918af
4 files changed
+36 -14

No files matched your search

+8 -3
View File
@@ -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))
+2 -1
View File
@@ -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
+23 -7
View File
@@ -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)<<FRACBITS, (SPDM_Y + 4)<<FRACBITS, FRACUNIT*3/4, FRACUNIT*3/4, (V_HUDTRANS|splitflags), (skp_smallsticker), NULL);
else //Colourized hud
{
UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
//V_DrawMappedPatch(SPDM_X + 1, SPDM_Y + 4, (V_HUDTRANS|splitflags), (skp_smallstickerclr), colormap);
V_DrawStretchyFixedPatch((SPDM_X)<<FRACBITS, (SPDM_Y + 4)<<FRACBITS, FRACUNIT*3/4, FRACUNIT*3/4, (V_HUDTRANS|splitflags), (skp_smallstickerclr), colormap);
}
V_DrawRankNum(SPDM_X + 26, SPDM_Y + 4, V_HUDTRANS|splitflags, convSpeed, 3, NULL);
V_DrawScaledPatch(SPDM_X + 31, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_speedpatches[cv_kartspeedometer.value]);
}
/*else if (cv_newspeedometer.value == 2 && achi_speedo) // why bother if we dont?
{
if (!K_UseColorHud())
V_DrawScaledPatch(SPDM_X + 1, SPDM_Y + 4, (V_HUDTRANS|splitflags), (skp_smallsticker));
@@ -8716,7 +8732,7 @@ static void K_drawKartSpeedometer(void)
V_DrawRankNum(SPDM_X + 26, SPDM_Y + 4, V_HUDTRANS|splitflags, convSpeed, 3, NULL);
V_DrawScaledPatch(SPDM_X + 31, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_speedpatches[cv_kartspeedometer.value]);
}
}*/
// Kart Z speedo bullshit...
// Draw the Speed counter.
+3 -3
View File
@@ -4490,13 +4490,13 @@ void M_Init(void)
}
#endif
if (!snw_speedo && !kartzspeedo) // why bother?
if (!xtra_speedo && !kartzspeedo) // why bother?
OP_SaturnMenu[sm_speedometer].status = IT_GRAYEDOUT;
if (!snw_speedo && kartzspeedo)
if (!xtra_speedo && kartzspeedo)
OP_SaturnMenu[sm_speedometer].text = "Speedometer (No Small)";
if (snw_speedo && !kartzspeedo)
if (xtra_speedo && !kartzspeedo)
OP_SaturnMenu[sm_speedometer].text = "Speedometer (No PMeter)";
if (!clr_hud){ // uhguauhauguuhee