From e13ba89f1a03d21e084eb564efecf4a37671084e Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 31 May 2025 17:20:26 +0200 Subject: [PATCH 1/5] use memcmp during startup map check prob not faster just looks a bit better tbh --- src/d_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index d10ba05ab..87596ca1c 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1812,7 +1812,7 @@ void D_SRB2Main(void) { name = lumpinfo->name; - if (name[0] == 'M' && name[1] == 'A' && name[2] == 'P') // Ignore the headers + if (memcmp(name, "MAP", 3) == 0) // Ignore the headers { INT16 num; if (name[5] != '\0') @@ -1842,7 +1842,7 @@ void D_SRB2Main(void) { name = lumpinfo->name; - if (name[0] == 'M' && name[1] == 'A' && name[2] == 'P') // Ignore the headers + if (memcmp(name, "MAP", 3) == 0) // Ignore the headers { INT16 num; if (name[5] != '\0') From 0b7a4ff4e0eea769331c9db451126da71b4bbf48 Mon Sep 17 00:00:00 2001 From: Indev Date: Thu, 26 Jun 2025 21:17:57 +0300 Subject: [PATCH 2/5] Replace '\' symbols with '\\' in comptime.sh --- comptime.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comptime.sh b/comptime.sh index 82dfa0060..42b985a62 100755 --- a/comptime.sh +++ b/comptime.sh @@ -17,7 +17,7 @@ EOF versiongit() { gitbranch="$(git rev-parse --abbrev-ref HEAD)" - gitversion="$(git show --pretty=format:'%h %s' -s HEAD | sed 's/"/\\"/g')" + gitversion="$(git show --pretty=format:'%h %s' -s HEAD | sed 's/"/\\"/g' | sed 's/\\/\\\\/g')" version "$gitbranch" "$gitversion"; exit 0 } From db67176eca12b609a42eb632122c9392dbfb0b18 Mon Sep 17 00:00:00 2001 From: Indev Date: Thu, 26 Jun 2025 22:50:59 +0300 Subject: [PATCH 3/5] Revert "Replace '\' symbols with '\\' in comptime.sh" This reverts commit 0b7a4ff4e0eea769331c9db451126da71b4bbf48. --- comptime.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comptime.sh b/comptime.sh index 42b985a62..82dfa0060 100755 --- a/comptime.sh +++ b/comptime.sh @@ -17,7 +17,7 @@ EOF versiongit() { gitbranch="$(git rev-parse --abbrev-ref HEAD)" - gitversion="$(git show --pretty=format:'%h %s' -s HEAD | sed 's/"/\\"/g' | sed 's/\\/\\\\/g')" + gitversion="$(git show --pretty=format:'%h %s' -s HEAD | sed 's/"/\\"/g')" version "$gitbranch" "$gitversion"; exit 0 } From 5638709670563de5e5e9dca1b5d232ee74517240 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 29 Jun 2025 11:44:04 +0200 Subject: [PATCH 4/5] some cleanup k_kart perhaps we could also move the saturn stuff into arrays, those massive walls of variables are kinda ugly lel --- src/d_main.c | 40 +-- src/k_kart.c | 926 ++++++++++++++++++++++++++------------------------- 2 files changed, 498 insertions(+), 468 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index ecd7e6247..f8cf89f54 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1216,32 +1216,32 @@ static boolean AddIWAD(void) } // extra graphic patches for saturn specific thingies -boolean found_extra_kart = false; +boolean found_extra_kart = false; boolean found_extra2_kart = false; boolean found_extra3_kart = false; -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 -boolean dial_speedo_clr = false; // dial speedometer colour check -boolean kartz_speedo = false; // kartZ speedo +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 +boolean dial_speedo_clr = false; // dial speedometer colour check +boolean kartz_speedo = false; // kartZ speedo boolean kartz_speedo_smol = false; // kartZ speedo but smol -boolean clr_hud = false; // colour hud check +boolean clr_hud = false; // colour hud check boolean driftgaugegfx_clr = false; // driftgauge colour check -boolean big_lap = false; // bigger lap counter -boolean big_lap_color = false; // bigger lap counter but colour -boolean statdp = false; // stat display for extended player setup -boolean nametaggfx = false; // Nametag stuffs -boolean driftgaugegfx = false; // Driftgauge stuffs -boolean multiitem_icon = false; // Extra icons for Sneakers, Banana and Jawz -boolean joystickicon = false; // Extra icons for the joystick input display -boolean minidoticon = false; // Dot graphic for minimap player angle display -boolean minilighticon = false; // mkwii-style minimap headlight +boolean big_lap = false; // bigger lap counter +boolean big_lap_color = false; // bigger lap counter but colour +boolean statdp = false; // stat display for extended player setup +boolean nametaggfx = false; // Nametag stuffs +boolean driftgaugegfx = false; // Driftgauge stuffs +boolean multiitem_icon = false; // Extra icons for Sneakers, Banana and Jawz +boolean joystickicon = false; // Extra icons for the joystick input display +boolean minidoticon = false; // Dot graphic for minimap player angle display +boolean minilighticon = false; // mkwii-style minimap headlight // static void IdentifyVersion(void) diff --git a/src/k_kart.c b/src/k_kart.c index 5589bdb6e..c8dc049a3 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -745,7 +745,8 @@ UINT8 K_GetKartColorByName(const char *name) UINT8 K_GetHudColor(void) { - if (cv_colorizedhud.value && cv_colorizedhudcolor.value) return cv_colorizedhudcolor.value; + if (cv_colorizedhud.value && cv_colorizedhudcolor.value) + return cv_colorizedhudcolor.value; return ((stplyr && gamestate == GS_LEVEL) ? stplyr->skincolor : cv_playercolor.value); } @@ -766,7 +767,7 @@ enum SPEEDO_EXTRA3, }; -static UINT8 K_GetSpeedometerStyle(void) +static SINT8 K_GetSpeedometerStyle(void) { if (cv_newspeedometer.value == 2 && xtra_speedo) return SPEEDO_EXTRA; @@ -4480,14 +4481,14 @@ static void K_DoShrink(player_t *user) void K_DoPogoSpring(mobj_t *mo, fixed_t vertispeed, UINT8 sound) { - const fixed_t vscale = mapobjectscale + (mo->scale - mapobjectscale); - if (mo->player && mo->player->spectator) return; if (mo->eflags & MFE_SPRUNG) return; + const fixed_t vscale = mapobjectscale + (mo->scale - mapobjectscale); + mo->standingslope = NULL; mo->eflags |= MFE_SPRUNG; @@ -5390,12 +5391,12 @@ player_t *K_FindJawzTarget(mobj_t *actor, player_t *source) // Engine Sounds. static void K_UpdateEngineSounds(player_t *player, ticcmd_t *cmd) { - const INT32 numsnds = 13; + static const INT32 numsnds = 13; - const fixed_t closedist = 160*FRACUNIT; - const fixed_t fardist = 1536*FRACUNIT; + static const fixed_t closedist = 160*FRACUNIT; + static const fixed_t fardist = 1536*FRACUNIT; - const UINT8 dampenval = 48; // 255 * 48 = close enough to FRACUNIT/6 + static const UINT8 dampenval = 48; // 255 * 48 = close enough to FRACUNIT/6 INT32 class, s, w; // engine class number @@ -5405,18 +5406,6 @@ static void K_UpdateEngineSounds(player_t *player, ticcmd_t *cmd) INT32 targetsnd = 0; INT32 i; - s = (player->kartspeed - 1) / 3; - w = (player->kartweight - 1) / 3; - -#define LOCKSTAT(stat) \ - if (stat < 0) { stat = 0; } \ - if (stat > 2) { stat = 2; } - LOCKSTAT(s); - LOCKSTAT(w); -#undef LOCKSTAT - - class = s + (3*w); - if (leveltime < 8 || player->spectator || player->exiting) { // Silence the engines, and reset sound number while we're at it. @@ -5522,13 +5511,25 @@ static void K_UpdateEngineSounds(player_t *player, ticcmd_t *cmd) return; } + s = (player->kartspeed - 1) / 3; + w = (player->kartweight - 1) / 3; + +#define LOCKSTAT(stat) \ + if (stat < 0) { stat = 0; } \ + if (stat > 2) { stat = 2; } + LOCKSTAT(s); + LOCKSTAT(w); +#undef LOCKSTAT + + class = s + (3*w); + S_StartSoundAtVolume(player->mo, (sfx_krta00 + player->kartstuff[k_enginesnd]) + (class * numsnds), volume); } static void K_UpdateInvincibilitySounds(player_t *player) { INT32 sfxnum = sfx_None; - boolean localplayer = P_IsLocalPlayer(player); + const boolean localplayer = P_IsLocalPlayer(player); if (player->mo->health > 0) { @@ -5594,21 +5595,14 @@ void K_KartPlayerHUDUpdate(player_t *player) static boolean K_SpeedLinesShouldBlend(player_t *player) { - fixed_t percentspeed = 0; - - if (!cv_playerblendeffects.value) - return false; - - if (!player->mo) + if (!cv_playerblendeffects.value || !player->mo) return false; if (player->kartstuff[k_sneakertimer]) return true; // this is how the percentage speedometer calcs, i suck at maths so this was the easiest thing to do lmao - percentspeed = (FixedDiv(player->speed, FixedMul(K_GetKartSpeed(player, false), ORIG_FRICTION))*100)>>FRACBITS; - - if (percentspeed > 127) // sneaker boost is around 25% + if ((FixedDiv(player->speed, FixedMul(K_GetKartSpeed(player, false), ORIG_FRICTION))*100)>>FRACBITS > 127) // sneaker boost is around 25% return true; return false; @@ -5724,6 +5718,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) else if (player->kartstuff[k_eggmanexplode]) // You're gonna diiiiie { const INT32 flashtime = 4<<(player->kartstuff[k_eggmanexplode]/TICRATE); + if (player->kartstuff[k_eggmanexplode] == 1 || (player->kartstuff[k_eggmanexplode] % (flashtime/2) != 0)) { player->mo->colorized = false; @@ -6055,6 +6050,7 @@ boolean K_CheckPlayersRespawnColliding(INT32 playernum, fixed_t x, fixed_t y) { INT32 i; fixed_t p1radius = players[playernum].mo->radius; + for (i = 0; i < MAXPLAYERS; i++) { if (playernum == i || !playeringame[i] || players[i].spectator || !players[i].mo || players[i].mo->health <= 0 @@ -6114,9 +6110,9 @@ INT16 K_GetKartTurnValue(player_t *player, INT16 turnvalue) return turnvalue; } - fixed_t p_topspeed = K_GetKartSpeed(player, false); - fixed_t p_curspeed = min(player->speed, p_topspeed * 2); - fixed_t p_maxspeed = p_topspeed * 3; + fixed_t p_topspeed = K_GetKartSpeed(player, false); + fixed_t p_curspeed = min(player->speed, p_topspeed * 2); + fixed_t p_maxspeed = p_topspeed * 3; fixed_t adjustangle = FixedDiv((p_maxspeed>>16) - (p_curspeed>>16), (p_maxspeed>>16) + player->kartweight); turnvalue = FixedMul(turnvalue, adjustangle); // Weight has a small effect on turning @@ -6337,7 +6333,7 @@ static void K_KartDrift(player_t *player, boolean onground) void K_KartUpdatePosition(player_t *player) { fixed_t position = 1; - fixed_t oldposition = player->kartstuff[k_position]; + fixed_t oldposition; fixed_t i, ppcd, pncd, ipcd, incd; fixed_t pmo, imo; mobj_t *mo; @@ -6345,6 +6341,8 @@ void K_KartUpdatePosition(player_t *player) if (player->spectator || !player->mo) return; + oldposition = player->kartstuff[k_position]; + for (i = 0; i < MAXPLAYERS; i++) { if (!playeringame[i] || players[i].spectator || !players[i].mo) @@ -7542,14 +7540,294 @@ void K_UpdateSpectateGrief(void) #define NUMPOSFRAMES 7 // White, three blues, three reds #define NUMWINFRAMES 6 // Red, yellow, green, cyan, blue, purple -//{ Patch Definitions -static patch_t *kp_nodraw; +//{ Patch Definitions +// --Saturn patches-- +// dont leave those unitialized incase we missed a check somewhere + +// -Speedometers- + +// Smol speedo +static patch_t *skp_smallsticker = NULL; +static patch_t *skp_smallsticker3 = NULL; + +static patch_t *skp_speedpatches[5] = {NULL}; + +// Achii speedo +static patch_t *skp_smallstickerachi = NULL; +static patch_t *skp_speedpatchesachi[5] = {NULL}; +static patch_t *skp_smallstickerachiclr = NULL; +static patch_t *skp_speedpatchesachiclr[5] = {NULL}; + +// Kartz speedo +static patch_t *kp_kartzspeedo[25] = {NULL}; +static patch_t *kp_kartzspeedo_smol[25] = {NULL}; + +// dial speedometer +static patch_t *skp_rankfinish = NULL; +static patch_t *skp_dialbase[2] = {NULL}; +static patch_t *skp_speedpatchesdial[5] = {NULL}; +static patch_t *skp_dialnum[10] = {NULL}; +//static patch_t *skp_dialclr = NULL; +static patch_t *skp_dialbaseclr[2] = {NULL}; +static patch_t *skp_speedpatchesdialclr[5] = {NULL}; +static patch_t *skp_dialnumclr[10] = {NULL}; + +// -Colourized hud- + +static patch_t *kp_timestickerclr = NULL; +static patch_t *kp_timestickerwideclr = NULL; +static patch_t *kp_lapstickerclr = NULL; +static patch_t *kp_lapstickerbigclr = NULL; +static patch_t *kp_lapstickerbig2clr = NULL; +static patch_t *kp_lapstickerwideclr = NULL; +//static patch_t *kp_lapstickernarrowclr = NULL; +static patch_t *kp_bumperstickerclr = NULL; +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}; + +// -Misc.- + +static patch_t *kp_lapstickerbig = NULL; +static patch_t *kp_lapstickerbig2 = NULL; + +static patch_t *nametagpic = NULL; +static patch_t *nametagline = NULL; +static patch_t *nametagspeed = NULL; +static patch_t *nametagweight = NULL; + +static patch_t *driftgauge = NULL; +static patch_t *driftgaugecolor = NULL; +static patch_t *driftgaugesmall = NULL; +static patch_t *driftgaugesmallcolor = NULL; + +static patch_t *kp_minimapdot = NULL; + +static patch_t *joybacking = NULL; +static patch_t *joyknob = NULL; +static patch_t *joyshadow = NULL; + +static patch_t *kp_multjawz = NULL; +static patch_t *kp_multsneaker[2] = {NULL}; +static patch_t *kp_multbanana[3] = {NULL}; + +static void K_LoadSaturnHUDGraphics(void) +{ + INT32 i; + char buffer[9]; + + if (found_extra_kart) + { + if (xtra_speedo) // smol speedometer + { + skp_smallsticker = (patch_t *)W_CachePatchName("SP_SMSTC", PU_HUDGFX); + skp_speedpatches[0] = (patch_t *)W_CachePatchName("K_TRNULL", PU_HUDGFX); // lolxd + skp_speedpatches[1] = (patch_t *)W_CachePatchName("SP_MKMH", PU_HUDGFX); + skp_speedpatches[2] = (patch_t *)W_CachePatchName("SP_MMPH", PU_HUDGFX); + skp_speedpatches[3] = (patch_t *)W_CachePatchName("SP_MFRAC", PU_HUDGFX); + skp_speedpatches[4] = (patch_t *)W_CachePatchName("SP_MPERC", PU_HUDGFX); + } + + if (achi_speedo) + { + skp_smallstickerachi = (patch_t *)W_CachePatchName("SP_AMSTC", PU_HUDGFX); + skp_speedpatchesachi[0] = (patch_t *)W_CachePatchName("K_TRNULL", PU_HUDGFX); // lolxd + skp_speedpatchesachi[1] = (patch_t *)W_CachePatchName("SP_AKMH", PU_HUDGFX); + skp_speedpatchesachi[2] = (patch_t *)W_CachePatchName("SP_AMPH", PU_HUDGFX); + skp_speedpatchesachi[3] = (patch_t *)W_CachePatchName("SP_AFRAC", PU_HUDGFX); + skp_speedpatchesachi[4] = (patch_t *)W_CachePatchName("SP_APERC", PU_HUDGFX); + } + + if (dial_speedo) + { + skp_rankfinish = (patch_t *)W_CachePatchName("RANKFIN", PU_HUDGFX); + skp_dialbase[0] = (patch_t *)W_CachePatchName("K_DSPBS1", PU_HUDGFX); + skp_dialbase[1] = (patch_t *)W_CachePatchName("K_DSPBS2", PU_HUDGFX); + + skp_speedpatchesdial[0] = (patch_t *)W_CachePatchName("K_TRNULL", PU_HUDGFX); // lolxd + skp_speedpatchesdial[1] = (patch_t *)W_CachePatchName("SP_DKMH", PU_HUDGFX); + skp_speedpatchesdial[2] = (patch_t *)W_CachePatchName("SP_DMPH", PU_HUDGFX); + skp_speedpatchesdial[3] = (patch_t *)W_CachePatchName("SP_DFRAC", PU_HUDGFX); + skp_speedpatchesdial[4] = (patch_t *)W_CachePatchName("SP_DPERC", PU_HUDGFX); + + sprintf(buffer, "K_DSPNMx"); + for (i = 0; i < 10; i++) + { + buffer[7] = '0'+(i%10); + skp_dialnum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); + } + } + + // KartZ speedo + if (kartz_speedo) + { + const char* patchNames[] = { + "K_KZSP1", "K_KZSP2", "K_KZSP3", "K_KZSP4", "K_KZSP5", + "K_KZSP6", "K_KZSP7", "K_KZSP8", "K_KZSP9", "K_KZSP10", + "K_KZSP11", "K_KZSP12", "K_KZSP13", "K_KZSP14", "K_KZSP15", + "K_KZSP16", "K_KZSP17", "K_KZSP18", "K_KZSP19", "K_KZSP20", + "K_KZSP21", "K_KZSP22", "K_KZSP23", "K_KZSP24", "K_KZSP25" + }; + + for (size_t m = 0; m < sizeof(patchNames) / sizeof(patchNames[0]); ++m) + { + kp_kartzspeedo[m] = (patch_t *)W_CachePatchName(patchNames[m], PU_HUDGFX); + } + } + + if (kartz_speedo_smol) + { + const char* patchNames[] = { + "K_KZSS1", "K_KZSS2", "K_KZSS3", "K_KZSS4", "K_KZSS5", + "K_KZSS6", "K_KZSS7", "K_KZSS8", "K_KZSS9", "K_KZSS10", + "K_KZSS11", "K_KZSS12", "K_KZSS13", "K_KZSS14", "K_KZSS15", + "K_KZSS16", "K_KZSS17", "K_KZSS18", "K_KZSS19", "K_KZSS20", + "K_KZSS21", "K_KZSS22", "K_KZSS23", "K_KZSS24", "K_KZSS25" + }; + + for (size_t m = 0; m < sizeof(patchNames) / sizeof(patchNames[0]); ++m) + { + kp_kartzspeedo_smol[m] = (patch_t *)W_CachePatchName(patchNames[m], PU_HUDGFX); + } + } + + if (big_lap) + { + kp_lapstickerbig = (patch_t *)W_CachePatchName("K_STLAPB", PU_HUDGFX); + kp_lapstickerbig2 = (patch_t *)W_CachePatchName("K_STLA2B", PU_HUDGFX); + } + + // Nametags + if (nametaggfx) + { + nametagpic = (patch_t *)W_CachePatchName("NTLINE", PU_HUDGFX); + nametagline = (patch_t *)W_CachePatchName("NTLINEV", PU_HUDGFX); + nametagspeed = (patch_t *)W_CachePatchName("NTSP", PU_HUDGFX); + nametagweight = (patch_t *)W_CachePatchName("NTWH", PU_HUDGFX); + } + + if (driftgaugegfx) + { + driftgauge = (patch_t *)W_CachePatchName("K_DGAU", PU_HUDGFX); + driftgaugesmall = (patch_t *)W_CachePatchName("K_DGSU", PU_HUDGFX); + + if (driftgaugegfx_clr) + { + driftgaugecolor = (patch_t *)W_CachePatchName("K_DCAU", PU_HUDGFX); + driftgaugesmallcolor = (patch_t *)W_CachePatchName("K_DCSU", PU_HUDGFX); + } + } + + if (joystickicon) + { + joybacking = (patch_t *)W_CachePatchName("JOYBCK", PU_HUDGFX); + joyknob = (patch_t *)W_CachePatchName("JOYKNB", PU_HUDGFX); + joyshadow = (patch_t *)W_CachePatchName("JOYSHD", PU_HUDGFX); + } + + if (minidoticon) + { + kp_minimapdot = (patch_t *)W_CachePatchName("MMAPDOT", PU_HUDGFX); + } + + if (multiitem_icon) + { + kp_multsneaker[0] = (patch_t *)W_CachePatchName("K_ITSHO2", PU_HUDGFX); + kp_multsneaker[1] = (patch_t *)W_CachePatchName("K_ITSHO3", PU_HUDGFX); + kp_multbanana[0] = (patch_t *)W_CachePatchName("K_ITBAN2", PU_HUDGFX); + kp_multbanana[1] = (patch_t *)W_CachePatchName("K_ITBAN3", PU_HUDGFX); + kp_multbanana[2] = (patch_t *)W_CachePatchName("K_ITBAN4", PU_HUDGFX); + kp_multjawz = (patch_t *)W_CachePatchName("K_ITJAW2", PU_HUDGFX); + } + } + + if (found_extra2_kart) + { + if (xtra_speedo_clr) + { + 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); + skp_speedpatchesachiclr[0] = (patch_t *)W_CachePatchName("K_TRNULL", PU_HUDGFX); // lolxd + skp_speedpatchesachiclr[1] = (patch_t *)W_CachePatchName("SC_AKMH", PU_HUDGFX); + skp_speedpatchesachiclr[2] = (patch_t *)W_CachePatchName("SC_AMPH", PU_HUDGFX); + skp_speedpatchesachiclr[3] = (patch_t *)W_CachePatchName("SC_AFRAC", PU_HUDGFX); + skp_speedpatchesachiclr[4] = (patch_t *)W_CachePatchName("SC_APERC", PU_HUDGFX); + } + + if (dial_speedo_clr) + { + skp_dialbaseclr[0] = (patch_t *)W_CachePatchName("K_DSPBC1", PU_HUDGFX); + skp_dialbaseclr[1] = (patch_t *)W_CachePatchName("K_DSPBC2", PU_HUDGFX); + + skp_speedpatchesdialclr[0] = (patch_t *)W_CachePatchName("K_TRNULL", PU_HUDGFX); // lolxd + skp_speedpatchesdialclr[1] = (patch_t *)W_CachePatchName("SC_DKMH", PU_HUDGFX); + skp_speedpatchesdialclr[2] = (patch_t *)W_CachePatchName("SC_DMPH", PU_HUDGFX); + skp_speedpatchesdialclr[3] = (patch_t *)W_CachePatchName("SC_DFRAC", PU_HUDGFX); + skp_speedpatchesdialclr[4] = (patch_t *)W_CachePatchName("SC_DPERC", PU_HUDGFX); + + sprintf(buffer, "K_DSPNCx"); + for (i = 0; i < 10; i++) + { + buffer[7] = '0'+(i%10); + skp_dialnumclr[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); + } + } + + if (big_lap_color) + { + kp_lapstickerbigclr = (patch_t *)W_CachePatchName("K_SCLAPB", PU_HUDGFX); + kp_lapstickerbig2clr = (patch_t *)W_CachePatchName("K_SCLA2B", PU_HUDGFX); + } + + // Colourized hud + if (clr_hud) + { + kp_timestickerclr = (patch_t *)W_CachePatchName("K_SCTIME", PU_HUDGFX); + kp_timestickerwideclr = (patch_t *)W_CachePatchName("K_SCTIMW", PU_HUDGFX); + kp_lapstickerclr = (patch_t *)W_CachePatchName("K_SCLAPS", PU_HUDGFX); + kp_lapstickerwideclr = (patch_t *)W_CachePatchName("K_SCLAPW", PU_HUDGFX); + kp_bumperstickerclr = (patch_t *)W_CachePatchName("K_SCBALN", PU_HUDGFX); + kp_bumperstickerwideclr = (patch_t *)W_CachePatchName("K_SCBALW", PU_HUDGFX); + kp_karmastickerclr = (patch_t *)W_CachePatchName("K_SCKARM", PU_HUDGFX); + kp_timeoutstickerclr = (patch_t *)W_CachePatchName("K_SCTOUT", PU_HUDGFX); + kp_itembgclr[0] = (patch_t *)W_CachePatchName("K_ITBC" , PU_HUDGFX); + kp_itembgclr[1] = (patch_t *)W_CachePatchName("K_ITBCD" , PU_HUDGFX); + kp_itembgclr[2] = (patch_t *)W_CachePatchName("K_ISBC" , PU_HUDGFX); + kp_itembgclr[3] = (patch_t *)W_CachePatchName("K_ISBCD" , PU_HUDGFX); + kp_itemmulstickerclr[1] = (patch_t *)W_CachePatchName("K_ISMULC", PU_HUDGFX); + 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 -- + +static patch_t *kp_nodraw; static patch_t *kp_timesticker; static patch_t *kp_timestickerwide; static patch_t *kp_lapsticker; -static patch_t *kp_lapstickerbig; -static patch_t *kp_lapstickerbig2; static patch_t *kp_lapstickerwide; //static patch_t *kp_lapstickernarrow; static patch_t *kp_splitlapflag; @@ -7559,27 +7837,6 @@ static patch_t *kp_karmasticker; static patch_t *kp_splitkarmabomb; static patch_t *kp_timeoutsticker; -//Colourized hud -static patch_t *kp_timestickerclr; -static patch_t *kp_timestickerwideclr; -static patch_t *kp_lapstickerclr; -static patch_t *kp_lapstickerbigclr; -static patch_t *kp_lapstickerbig2clr; -static patch_t *kp_lapstickerwideclr; -//static patch_t *kp_lapstickernarrowclr; -static patch_t *kp_bumperstickerclr; -static patch_t *kp_bumperstickerwideclr; -static patch_t *kp_karmastickerclr; -static patch_t *kp_timeoutstickerclr; -static patch_t *skp_smallstickerclr; -static patch_t *skp_smallstickerclr3; -static patch_t *kp_itemmulstickerclr[2]; -static patch_t *kp_itembgclr[4]; - -//Kartz speedo -static patch_t *kp_kartzspeedo[25]; -static patch_t *kp_kartzspeedo_smol[25]; - static patch_t *kp_startcountdown[16]; static patch_t *kp_racefinish[6]; @@ -7608,15 +7865,12 @@ static patch_t *kp_itemmulsticker[2]; static patch_t *kp_itemx; static patch_t *kp_sneaker[2]; -static patch_t *kp_multsneaker[2]; static patch_t *kp_rocketsneaker[2]; static patch_t *kp_invincibility[13]; static patch_t *kp_banana[2]; -static patch_t *kp_multbanana[3]; static patch_t *kp_eggman[2]; static patch_t *kp_orbinaut[5]; static patch_t *kp_jawz[2]; -static patch_t *kp_multjawz[1]; static patch_t *kp_mine[2]; static patch_t *kp_ballhog[2]; static patch_t *kp_selfpropelledbomb[2]; @@ -7643,264 +7897,60 @@ static patch_t *kp_lapanim_number[10][3]; static patch_t *kp_lapanim_emblem[2]; static patch_t *kp_lapanim_hand[3]; -static patch_t *nametagpic; -static patch_t *nametagline; -static patch_t *nametagspeed; -static patch_t *nametagweight; - -static patch_t *driftgauge; -static patch_t *driftgaugecolor; -static patch_t *driftgaugesmall; -static patch_t *driftgaugesmallcolor; - static patch_t *kp_yougotem; -static patch_t *skp_smallsticker; -static patch_t *skp_smallsticker3; -static patch_t *skp_speedpatches[5]; - -static patch_t *skp_smallstickerachi; -static patch_t *skp_speedpatchesachi[5]; -static patch_t *skp_smallstickerachiclr; -static patch_t *skp_speedpatchesachiclr[5]; - -// dial speedometer -static patch_t *skp_rankfinish; -static patch_t *skp_dialbase[2]; -static patch_t *skp_speedpatchesdial[5]; -static patch_t *skp_dialnum[10]; -//static patch_t *skp_dialclr; -static patch_t *skp_dialbaseclr[2]; -static patch_t *skp_speedpatchesdialclr[5]; -static patch_t *skp_dialnumclr[10]; - -static patch_t *joybacking; -static patch_t *joyknob; -static patch_t *joyshadow; - -static patch_t *kp_minimapdot; - void K_LoadKartHUDGraphics(void) { INT32 i, j; char buffer[9]; // Null Stuff - kp_nodraw = W_CachePatchName("K_TRNULL", PU_HUDGFX); + kp_nodraw = (patch_t *)W_CachePatchName("K_TRNULL", PU_HUDGFX); // Stickers - kp_timesticker = W_CachePatchName("K_STTIME", PU_HUDGFX); - kp_timestickerwide = W_CachePatchName("K_STTIMW", PU_HUDGFX); - kp_lapsticker = W_CachePatchName("K_STLAPS", PU_HUDGFX); - kp_lapstickerwide = W_CachePatchName("K_STLAPW", PU_HUDGFX); - //kp_lapstickernarrow = W_CachePatchName("K_STLAPN", PU_HUDGFX); - kp_splitlapflag = W_CachePatchName("K_SPTLAP", PU_HUDGFX); - kp_bumpersticker = W_CachePatchName("K_STBALN", PU_HUDGFX); - kp_bumperstickerwide = W_CachePatchName("K_STBALW", PU_HUDGFX); - kp_karmasticker = W_CachePatchName("K_STKARM", PU_HUDGFX); - kp_splitkarmabomb = W_CachePatchName("K_SPTKRM", PU_HUDGFX); - kp_timeoutsticker = W_CachePatchName("K_STTOUT", PU_HUDGFX); - - if (xtra_speedo) // snowy speedometer - { - skp_smallsticker = W_CachePatchName("SP_SMSTC", PU_HUDGFX); - skp_speedpatches[0] = W_CachePatchName("K_TRNULL", PU_HUDGFX); // lolxd - skp_speedpatches[1] = W_CachePatchName("SP_MKMH", PU_HUDGFX); - skp_speedpatches[2] = W_CachePatchName("SP_MMPH", PU_HUDGFX); - skp_speedpatches[3] = W_CachePatchName("SP_MFRAC", PU_HUDGFX); - skp_speedpatches[4] = W_CachePatchName("SP_MPERC", PU_HUDGFX); - } - - if (xtra_speedo3) // 80x11 patch scaled to size - { - skp_smallsticker3 = W_CachePatchName("SP_SM3TC", PU_HUDGFX); - } - - if (achi_speedo) - { - skp_smallstickerachi = W_CachePatchName("SP_AMSTC", PU_HUDGFX); - skp_speedpatchesachi[0] = W_CachePatchName("K_TRNULL", PU_HUDGFX); // lolxd - skp_speedpatchesachi[1] = W_CachePatchName("SP_AKMH", PU_HUDGFX); - skp_speedpatchesachi[2] = W_CachePatchName("SP_AMPH", PU_HUDGFX); - skp_speedpatchesachi[3] = W_CachePatchName("SP_AFRAC", PU_HUDGFX); - skp_speedpatchesachi[4] = W_CachePatchName("SP_APERC", PU_HUDGFX); - } - - if (dial_speedo) - { - skp_rankfinish = W_CachePatchName("RANKFIN", PU_HUDGFX); - skp_dialbase[0] = W_CachePatchName("K_DSPBS1", PU_HUDGFX); - skp_dialbase[1] = W_CachePatchName("K_DSPBS2", PU_HUDGFX); - - skp_speedpatchesdial[0] = W_CachePatchName("K_TRNULL", PU_HUDGFX); // lolxd - skp_speedpatchesdial[1] = W_CachePatchName("SP_DKMH", PU_HUDGFX); - skp_speedpatchesdial[2] = W_CachePatchName("SP_DMPH", PU_HUDGFX); - skp_speedpatchesdial[3] = W_CachePatchName("SP_DFRAC", PU_HUDGFX); - skp_speedpatchesdial[4] = W_CachePatchName("SP_DPERC", PU_HUDGFX); - - sprintf(buffer, "K_DSPNMx"); - for (i = 0; i < 10; i++) - { - buffer[7] = '0'+(i%10); - skp_dialnum[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX); - } - } - - if (big_lap) - { - kp_lapstickerbig = W_CachePatchName("K_STLAPB", PU_HUDGFX); - kp_lapstickerbig2 = W_CachePatchName("K_STLA2B", PU_HUDGFX); - } - - // Colourized hud - if (clr_hud) - { - kp_timestickerclr = W_CachePatchName("K_SCTIME", PU_HUDGFX); - kp_timestickerwideclr = W_CachePatchName("K_SCTIMW", PU_HUDGFX); - kp_lapstickerclr = W_CachePatchName("K_SCLAPS", PU_HUDGFX); - kp_lapstickerwideclr = W_CachePatchName("K_SCLAPW", PU_HUDGFX); - kp_bumperstickerclr = W_CachePatchName("K_SCBALN", PU_HUDGFX); - kp_bumperstickerwideclr = W_CachePatchName("K_SCBALW", PU_HUDGFX); - kp_karmastickerclr = W_CachePatchName("K_SCKARM", PU_HUDGFX); - kp_timeoutstickerclr = W_CachePatchName("K_SCTOUT", PU_HUDGFX); - kp_itembgclr[0] = W_CachePatchName("K_ITBC" , PU_HUDGFX); - kp_itembgclr[1] = W_CachePatchName("K_ITBCD" , PU_HUDGFX); - kp_itembgclr[2] = W_CachePatchName("K_ISBC" , PU_HUDGFX); - kp_itembgclr[3] = W_CachePatchName("K_ISBCD" , PU_HUDGFX); - kp_itemmulstickerclr[1] = W_CachePatchName("K_ISMULC", PU_HUDGFX); - kp_itemmulstickerclr[0] = W_CachePatchName("K_ITMULC", PU_HUDGFX); - } - - if (big_lap_color) - { - kp_lapstickerbigclr = W_CachePatchName("K_SCLAPB", PU_HUDGFX); - kp_lapstickerbig2clr = W_CachePatchName("K_SCLA2B", PU_HUDGFX); - } - - if (xtra_speedo && xtra_speedo_clr) - skp_smallstickerclr = W_CachePatchName("SC_SMSTC", PU_HUDGFX); - - if (xtra_speedo3 && xtra_speedo_clr3) // 80x11 patch scaled to size - skp_smallstickerclr3 = W_CachePatchName("SC_SM3TC", PU_HUDGFX); - - if (achi_speedo && achi_speedo_clr) - { - skp_smallstickerachiclr = W_CachePatchName("SC_AMSTC", PU_HUDGFX); - skp_speedpatchesachiclr[0] = W_CachePatchName("K_TRNULL", PU_HUDGFX); // lolxd - skp_speedpatchesachiclr[1] = W_CachePatchName("SC_AKMH", PU_HUDGFX); - skp_speedpatchesachiclr[2] = W_CachePatchName("SC_AMPH", PU_HUDGFX); - skp_speedpatchesachiclr[3] = W_CachePatchName("SC_AFRAC", PU_HUDGFX); - skp_speedpatchesachiclr[4] = W_CachePatchName("SC_APERC", PU_HUDGFX); - } - - if (dial_speedo && dial_speedo_clr) - { - skp_dialbaseclr[0] = W_CachePatchName("K_DSPBC1", PU_HUDGFX); - skp_dialbaseclr[1] = W_CachePatchName("K_DSPBC2", PU_HUDGFX); - - skp_speedpatchesdialclr[0] = W_CachePatchName("K_TRNULL", PU_HUDGFX); // lolxd - skp_speedpatchesdialclr[1] = W_CachePatchName("SC_DKMH", PU_HUDGFX); - skp_speedpatchesdialclr[2] = W_CachePatchName("SC_DMPH", PU_HUDGFX); - skp_speedpatchesdialclr[3] = W_CachePatchName("SC_DFRAC", PU_HUDGFX); - skp_speedpatchesdialclr[4] = W_CachePatchName("SC_DPERC", PU_HUDGFX); - - sprintf(buffer, "K_DSPNCx"); - for (i = 0; i < 10; i++) - { - buffer[7] = '0'+(i%10); - skp_dialnumclr[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX); - } - } - - // KartZ speedo - if (kartz_speedo) - { - const char* patchNames[] = { - "K_KZSP1", "K_KZSP2", "K_KZSP3", "K_KZSP4", "K_KZSP5", - "K_KZSP6", "K_KZSP7", "K_KZSP8", "K_KZSP9", "K_KZSP10", - "K_KZSP11", "K_KZSP12", "K_KZSP13", "K_KZSP14", "K_KZSP15", - "K_KZSP16", "K_KZSP17", "K_KZSP18", "K_KZSP19", "K_KZSP20", - "K_KZSP21", "K_KZSP22", "K_KZSP23", "K_KZSP24", "K_KZSP25" - }; - - for (size_t m = 0; m < sizeof(patchNames) / sizeof(patchNames[0]); ++m) - { - kp_kartzspeedo[m] = W_CachePatchName(patchNames[m], PU_HUDGFX); - } - } - - if (kartz_speedo_smol) - { - const char* patchNames[] = { - "K_KZSS1", "K_KZSS2", "K_KZSS3", "K_KZSS4", "K_KZSS5", - "K_KZSS6", "K_KZSS7", "K_KZSS8", "K_KZSS9", "K_KZSS10", - "K_KZSS11", "K_KZSS12", "K_KZSS13", "K_KZSS14", "K_KZSS15", - "K_KZSS16", "K_KZSS17", "K_KZSS18", "K_KZSS19", "K_KZSS20", - "K_KZSS21", "K_KZSS22", "K_KZSS23", "K_KZSS24", "K_KZSS25" - }; - - for (size_t m = 0; m < sizeof(patchNames) / sizeof(patchNames[0]); ++m) - { - kp_kartzspeedo_smol[m] = W_CachePatchName(patchNames[m], PU_HUDGFX); - } - } - - // Nametags - if (nametaggfx) - { - nametagpic = W_CachePatchName("NTLINE", PU_HUDGFX); - nametagline = W_CachePatchName("NTLINEV", PU_HUDGFX); - nametagspeed = W_CachePatchName("NTSP", PU_HUDGFX); - nametagweight = W_CachePatchName("NTWH", PU_HUDGFX); - } - - if (driftgaugegfx) - { - driftgauge = W_CachePatchName("K_DGAU", PU_HUDGFX); - driftgaugecolor = W_CachePatchName("K_DCAU", PU_HUDGFX); - } - - if (driftgaugegfx_clr) - { - driftgaugesmall = W_CachePatchName("K_DGSU", PU_HUDGFX); - driftgaugesmallcolor = W_CachePatchName("K_DCSU", PU_HUDGFX); - } - - if (joystickicon) - { - joybacking = W_CachePatchName("JOYBCK", PU_HUDGFX); - joyknob = W_CachePatchName("JOYKNB", PU_HUDGFX); - joyshadow = W_CachePatchName("JOYSHD", PU_HUDGFX); - } + kp_timesticker = (patch_t *)W_CachePatchName("K_STTIME", PU_HUDGFX); + kp_timestickerwide = (patch_t *)W_CachePatchName("K_STTIMW", PU_HUDGFX); + kp_lapsticker = (patch_t *)W_CachePatchName("K_STLAPS", PU_HUDGFX); + kp_lapstickerwide = (patch_t *)W_CachePatchName("K_STLAPW", PU_HUDGFX); + //kp_lapstickernarrow = (patch_t *)W_CachePatchName("K_STLAPN", PU_HUDGFX); + kp_splitlapflag = (patch_t *)W_CachePatchName("K_SPTLAP", PU_HUDGFX); + kp_bumpersticker = (patch_t *)W_CachePatchName("K_STBALN", PU_HUDGFX); + kp_bumperstickerwide = (patch_t *)W_CachePatchName("K_STBALW", PU_HUDGFX); + kp_karmasticker = (patch_t *)W_CachePatchName("K_STKARM", PU_HUDGFX); + kp_splitkarmabomb = (patch_t *)W_CachePatchName("K_SPTKRM", PU_HUDGFX); + kp_timeoutsticker = (patch_t *)W_CachePatchName("K_STTOUT", PU_HUDGFX); // Starting countdown - kp_startcountdown[0] = W_CachePatchName("K_CNT3A", PU_HUDGFX); - kp_startcountdown[1] = W_CachePatchName("K_CNT2A", PU_HUDGFX); - kp_startcountdown[2] = W_CachePatchName("K_CNT1A", PU_HUDGFX); - kp_startcountdown[3] = W_CachePatchName("K_CNTGOA", PU_HUDGFX); - kp_startcountdown[4] = W_CachePatchName("K_CNT3B", PU_HUDGFX); - kp_startcountdown[5] = W_CachePatchName("K_CNT2B", PU_HUDGFX); - kp_startcountdown[6] = W_CachePatchName("K_CNT1B", PU_HUDGFX); - kp_startcountdown[7] = W_CachePatchName("K_CNTGOB", PU_HUDGFX); + kp_startcountdown[0] = (patch_t *)W_CachePatchName("K_CNT3A", PU_HUDGFX); + kp_startcountdown[1] = (patch_t *)W_CachePatchName("K_CNT2A", PU_HUDGFX); + kp_startcountdown[2] = (patch_t *)W_CachePatchName("K_CNT1A", PU_HUDGFX); + kp_startcountdown[3] = (patch_t *)W_CachePatchName("K_CNTGOA", PU_HUDGFX); + kp_startcountdown[4] = (patch_t *)W_CachePatchName("K_CNT3B", PU_HUDGFX); + kp_startcountdown[5] = (patch_t *)W_CachePatchName("K_CNT2B", PU_HUDGFX); + kp_startcountdown[6] = (patch_t *)W_CachePatchName("K_CNT1B", PU_HUDGFX); + kp_startcountdown[7] = (patch_t *)W_CachePatchName("K_CNTGOB", PU_HUDGFX); + // Splitscreen - kp_startcountdown[8] = W_CachePatchName("K_SMC3A", PU_HUDGFX); - kp_startcountdown[9] = W_CachePatchName("K_SMC2A", PU_HUDGFX); - kp_startcountdown[10] = W_CachePatchName("K_SMC1A", PU_HUDGFX); - kp_startcountdown[11] = W_CachePatchName("K_SMCGOA", PU_HUDGFX); - kp_startcountdown[12] = W_CachePatchName("K_SMC3B", PU_HUDGFX); - kp_startcountdown[13] = W_CachePatchName("K_SMC2B", PU_HUDGFX); - kp_startcountdown[14] = W_CachePatchName("K_SMC1B", PU_HUDGFX); - kp_startcountdown[15] = W_CachePatchName("K_SMCGOB", PU_HUDGFX); + kp_startcountdown[8] = (patch_t *)W_CachePatchName("K_SMC3A", PU_HUDGFX); + kp_startcountdown[9] = (patch_t *)W_CachePatchName("K_SMC2A", PU_HUDGFX); + kp_startcountdown[10] = (patch_t *)W_CachePatchName("K_SMC1A", PU_HUDGFX); + kp_startcountdown[11] = (patch_t *)W_CachePatchName("K_SMCGOA", PU_HUDGFX); + kp_startcountdown[12] = (patch_t *)W_CachePatchName("K_SMC3B", PU_HUDGFX); + kp_startcountdown[13] = (patch_t *)W_CachePatchName("K_SMC2B", PU_HUDGFX); + kp_startcountdown[14] = (patch_t *)W_CachePatchName("K_SMC1B", PU_HUDGFX); + kp_startcountdown[15] = (patch_t *)W_CachePatchName("K_SMCGOB", PU_HUDGFX); // Finish - kp_racefinish[0] = W_CachePatchName("K_FINA", PU_HUDGFX); - kp_racefinish[1] = W_CachePatchName("K_FINB", PU_HUDGFX); + kp_racefinish[0] = (patch_t *)W_CachePatchName("K_FINA", PU_HUDGFX); + kp_racefinish[1] = (patch_t *)W_CachePatchName("K_FINB", PU_HUDGFX); + // Splitscreen - kp_racefinish[2] = W_CachePatchName("K_SMFINA", PU_HUDGFX); - kp_racefinish[3] = W_CachePatchName("K_SMFINB", PU_HUDGFX); + kp_racefinish[2] = (patch_t *)W_CachePatchName("K_SMFINA", PU_HUDGFX); + kp_racefinish[3] = (patch_t *)W_CachePatchName("K_SMFINB", PU_HUDGFX); + // 2P splitscreen - kp_racefinish[4] = W_CachePatchName("K_2PFINA", PU_HUDGFX); - kp_racefinish[5] = W_CachePatchName("K_2PFINB", PU_HUDGFX); + kp_racefinish[4] = (patch_t *)W_CachePatchName("K_2PFINA", PU_HUDGFX); + kp_racefinish[5] = (patch_t *)W_CachePatchName("K_2PFINB", PU_HUDGFX); // Position numbers sprintf(buffer, "K_POSNxx"); @@ -7909,9 +7959,8 @@ void K_LoadKartHUDGraphics(void) buffer[6] = '0'+i; for (j = 0; j < NUMPOSFRAMES; j++) { - //sprintf(buffer, "K_POSN%d%d", i, j); buffer[7] = '0'+j; - kp_positionnum[i][j] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX); + kp_positionnum[i][j] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); } } @@ -7919,7 +7968,7 @@ void K_LoadKartHUDGraphics(void) for (i = 0; i < NUMWINFRAMES; i++) { buffer[7] = '0'+i; - kp_winnernum[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX); + kp_winnernum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); } sprintf(buffer, "OPPRNKxx"); @@ -7927,122 +7976,105 @@ void K_LoadKartHUDGraphics(void) { buffer[6] = '0'+(i/10); buffer[7] = '0'+(i%10); - kp_facenum[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX); + kp_facenum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); } sprintf(buffer, "K_CHILIx"); for (i = 0; i < 8; i++) { buffer[7] = '0'+(i+1); - kp_facehighlight[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX); + kp_facehighlight[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); } // Extra ranking icons - kp_rankbumper = W_CachePatchName("K_BLNICO", PU_HUDGFX); - kp_tinybumper[0] = W_CachePatchName("K_BLNA", PU_HUDGFX); - kp_tinybumper[1] = W_CachePatchName("K_BLNB", PU_HUDGFX); - kp_ranknobumpers = W_CachePatchName("K_NOBLNS", PU_HUDGFX); + kp_rankbumper = (patch_t *)W_CachePatchName("K_BLNICO", PU_HUDGFX); + kp_tinybumper[0] = (patch_t *)W_CachePatchName("K_BLNA", PU_HUDGFX); + kp_tinybumper[1] = (patch_t *)W_CachePatchName("K_BLNB", PU_HUDGFX); + kp_ranknobumpers = (patch_t *)W_CachePatchName("K_NOBLNS", PU_HUDGFX); // Battle graphics - kp_battlewin = W_CachePatchName("K_BWIN", PU_HUDGFX); - kp_battlecool = W_CachePatchName("K_BCOOL", PU_HUDGFX); - kp_battlelose = W_CachePatchName("K_BLOSE", PU_HUDGFX); - kp_battlewait = W_CachePatchName("K_BWAIT", PU_HUDGFX); - kp_battleinfo = W_CachePatchName("K_BINFO", PU_HUDGFX); - kp_wanted = W_CachePatchName("K_WANTED", PU_HUDGFX); - kp_wantedsplit = W_CachePatchName("4PWANTED", PU_HUDGFX); - kp_wantedreticle = W_CachePatchName("MMAPWANT", PU_HUDGFX); - - if (minidoticon) - kp_minimapdot = W_CachePatchName("MMAPDOT", PU_HUDGFX); + kp_battlewin = (patch_t *)W_CachePatchName("K_BWIN", PU_HUDGFX); + kp_battlecool = (patch_t *)W_CachePatchName("K_BCOOL", PU_HUDGFX); + kp_battlelose = (patch_t *)W_CachePatchName("K_BLOSE", PU_HUDGFX); + kp_battlewait = (patch_t *)W_CachePatchName("K_BWAIT", PU_HUDGFX); + kp_battleinfo = (patch_t *)W_CachePatchName("K_BINFO", PU_HUDGFX); + kp_wanted = (patch_t *)W_CachePatchName("K_WANTED", PU_HUDGFX); + kp_wantedsplit = (patch_t *)W_CachePatchName("4PWANTED", PU_HUDGFX); + kp_wantedreticle = (patch_t *)W_CachePatchName("MMAPWANT", PU_HUDGFX); // Kart Item Windows - kp_itembg[0] = W_CachePatchName("K_ITBG", PU_HUDGFX); - kp_itembg[1] = W_CachePatchName("K_ITBGD", PU_HUDGFX); - kp_itemtimer[0] = W_CachePatchName("K_ITIMER", PU_HUDGFX); - kp_itemmulsticker[0] = W_CachePatchName("K_ITMUL", PU_HUDGFX); - kp_itemx = W_CachePatchName("K_ITX", PU_HUDGFX); + kp_itembg[0] = (patch_t *)W_CachePatchName("K_ITBG", PU_HUDGFX); + kp_itembg[1] = (patch_t *)W_CachePatchName("K_ITBGD", PU_HUDGFX); + kp_itemtimer[0] = (patch_t *)W_CachePatchName("K_ITIMER", PU_HUDGFX); + kp_itemmulsticker[0] = (patch_t *)W_CachePatchName("K_ITMUL", PU_HUDGFX); + kp_itemx = (patch_t *)W_CachePatchName("K_ITX", PU_HUDGFX); + // Splitscreen + kp_itembg[2] = (patch_t *)W_CachePatchName("K_ISBG", PU_HUDGFX); + kp_itembg[3] = (patch_t *)W_CachePatchName("K_ISBGD", PU_HUDGFX); + kp_itemtimer[1] = (patch_t *)W_CachePatchName("K_ISIMER", PU_HUDGFX); + kp_itemmulsticker[1] = (patch_t *)W_CachePatchName("K_ISMUL", PU_HUDGFX); - kp_sneaker[0] = W_CachePatchName("K_ITSHOE", PU_HUDGFX); - if (multiitem_icon) - { - kp_multsneaker[0] = W_CachePatchName("K_ITSHO2", PU_HUDGFX); - kp_multsneaker[1] = W_CachePatchName("K_ITSHO3", PU_HUDGFX); - } - kp_rocketsneaker[0] = W_CachePatchName("K_ITRSHE", PU_HUDGFX); + // Kart Items + kp_sneaker[0] = (patch_t *)W_CachePatchName("K_ITSHOE", PU_HUDGFX); + kp_rocketsneaker[0] = (patch_t *)W_CachePatchName("K_ITRSHE", PU_HUDGFX); + kp_banana[0] = (patch_t *)W_CachePatchName("K_ITBANA", PU_HUDGFX); + kp_eggman[0] = (patch_t *)W_CachePatchName("K_ITEGGM", PU_HUDGFX); + kp_jawz[0] = (patch_t *)W_CachePatchName("K_ITJAWZ", PU_HUDGFX); + kp_mine[0] = (patch_t *)W_CachePatchName("K_ITMINE", PU_HUDGFX); + kp_ballhog[0] = (patch_t *)W_CachePatchName("K_ITBHOG", PU_HUDGFX); + kp_selfpropelledbomb[0] = (patch_t *)W_CachePatchName("K_ITSPB", PU_HUDGFX); + kp_grow[0] = (patch_t *)W_CachePatchName("K_ITGROW", PU_HUDGFX); + kp_shrink[0] = (patch_t *)W_CachePatchName("K_ITSHRK", PU_HUDGFX); + kp_thundershield[0] = (patch_t *)W_CachePatchName("K_ITTHNS", PU_HUDGFX); + kp_hyudoro[0] = (patch_t *)W_CachePatchName("K_ITHYUD", PU_HUDGFX); + kp_pogospring[0] = (patch_t *)W_CachePatchName("K_ITPOGO", PU_HUDGFX); + kp_kitchensink[0] = (patch_t *)W_CachePatchName("K_ITSINK", PU_HUDGFX); + kp_sadface[0] = (patch_t *)W_CachePatchName("K_ITSAD", PU_HUDGFX); + // Splitscreen + kp_sneaker[1] = (patch_t *)W_CachePatchName("K_ISSHOE", PU_HUDGFX); + kp_rocketsneaker[1] = (patch_t *)W_CachePatchName("K_ISRSHE", PU_HUDGFX); + kp_banana[1] = (patch_t *)W_CachePatchName("K_ISBANA", PU_HUDGFX); + kp_eggman[1] = (patch_t *)W_CachePatchName("K_ISEGGM", PU_HUDGFX); + kp_orbinaut[4] = (patch_t *)W_CachePatchName("K_ISORBN", PU_HUDGFX); + kp_jawz[1] = (patch_t *)W_CachePatchName("K_ISJAWZ", PU_HUDGFX); + kp_mine[1] = (patch_t *)W_CachePatchName("K_ISMINE", PU_HUDGFX); + kp_ballhog[1] = (patch_t *)W_CachePatchName("K_ISBHOG", PU_HUDGFX); + kp_selfpropelledbomb[1] = (patch_t *)W_CachePatchName("K_ISSPB", PU_HUDGFX); + kp_grow[1] = (patch_t *)W_CachePatchName("K_ISGROW", PU_HUDGFX); + kp_shrink[1] = (patch_t *)W_CachePatchName("K_ISSHRK", PU_HUDGFX); + kp_thundershield[1] = (patch_t *)W_CachePatchName("K_ISTHNS", PU_HUDGFX); + kp_hyudoro[1] = (patch_t *)W_CachePatchName("K_ISHYUD", PU_HUDGFX); + kp_pogospring[1] = (patch_t *)W_CachePatchName("K_ISPOGO", PU_HUDGFX); + kp_kitchensink[1] = (patch_t *)W_CachePatchName("K_ISSINK", PU_HUDGFX); + kp_sadface[1] = (patch_t *)W_CachePatchName("K_ISSAD", PU_HUDGFX); sprintf(buffer, "K_ITINVx"); for (i = 0; i < 7; i++) { buffer[7] = '1'+i; - kp_invincibility[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX); + kp_invincibility[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); } - kp_banana[0] = W_CachePatchName("K_ITBANA", PU_HUDGFX); - if (multiitem_icon) - { - kp_multbanana[0] = W_CachePatchName("K_ITBAN2", PU_HUDGFX); - kp_multbanana[1] = W_CachePatchName("K_ITBAN3", PU_HUDGFX); - kp_multbanana[2] = W_CachePatchName("K_ITBAN4", PU_HUDGFX); - } - kp_eggman[0] = W_CachePatchName("K_ITEGGM", PU_HUDGFX); sprintf(buffer, "K_ITORBx"); for (i = 0; i < 4; i++) { buffer[7] = '1'+i; - kp_orbinaut[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX); + kp_orbinaut[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); } - kp_jawz[0] = W_CachePatchName("K_ITJAWZ", PU_HUDGFX); - if (multiitem_icon) - { - kp_multjawz[0] = W_CachePatchName("K_ITJAW2", PU_HUDGFX); - } - kp_mine[0] = W_CachePatchName("K_ITMINE", PU_HUDGFX); - kp_ballhog[0] = W_CachePatchName("K_ITBHOG", PU_HUDGFX); - kp_selfpropelledbomb[0] = W_CachePatchName("K_ITSPB", PU_HUDGFX); - kp_grow[0] = W_CachePatchName("K_ITGROW", PU_HUDGFX); - kp_shrink[0] = W_CachePatchName("K_ITSHRK", PU_HUDGFX); - kp_thundershield[0] = W_CachePatchName("K_ITTHNS", PU_HUDGFX); - kp_hyudoro[0] = W_CachePatchName("K_ITHYUD", PU_HUDGFX); - kp_pogospring[0] = W_CachePatchName("K_ITPOGO", PU_HUDGFX); - kp_kitchensink[0] = W_CachePatchName("K_ITSINK", PU_HUDGFX); - kp_sadface[0] = W_CachePatchName("K_ITSAD", PU_HUDGFX); - // Splitscreen - kp_itembg[2] = W_CachePatchName("K_ISBG", PU_HUDGFX); - kp_itembg[3] = W_CachePatchName("K_ISBGD", PU_HUDGFX); - kp_itemtimer[1] = W_CachePatchName("K_ISIMER", PU_HUDGFX); - kp_itemmulsticker[1] = W_CachePatchName("K_ISMUL", PU_HUDGFX); - - kp_sneaker[1] = W_CachePatchName("K_ISSHOE", PU_HUDGFX); - kp_rocketsneaker[1] = W_CachePatchName("K_ISRSHE", PU_HUDGFX); sprintf(buffer, "K_ISINVx"); for (i = 0; i < 6; i++) { buffer[7] = '1'+i; - kp_invincibility[i+7] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX); + kp_invincibility[i+7] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); } - kp_banana[1] = W_CachePatchName("K_ISBANA", PU_HUDGFX); - kp_eggman[1] = W_CachePatchName("K_ISEGGM", PU_HUDGFX); - kp_orbinaut[4] = W_CachePatchName("K_ISORBN", PU_HUDGFX); - kp_jawz[1] = W_CachePatchName("K_ISJAWZ", PU_HUDGFX); - kp_mine[1] = W_CachePatchName("K_ISMINE", PU_HUDGFX); - kp_ballhog[1] = W_CachePatchName("K_ISBHOG", PU_HUDGFX); - kp_selfpropelledbomb[1] = W_CachePatchName("K_ISSPB", PU_HUDGFX); - kp_grow[1] = W_CachePatchName("K_ISGROW", PU_HUDGFX); - kp_shrink[1] = W_CachePatchName("K_ISSHRK", PU_HUDGFX); - kp_thundershield[1] = W_CachePatchName("K_ISTHNS", PU_HUDGFX); - kp_hyudoro[1] = W_CachePatchName("K_ISHYUD", PU_HUDGFX); - kp_pogospring[1] = W_CachePatchName("K_ISPOGO", PU_HUDGFX); - kp_kitchensink[1] = W_CachePatchName("K_ISSINK", PU_HUDGFX); - kp_sadface[1] = W_CachePatchName("K_ISSAD", PU_HUDGFX); // CHECK indicators sprintf(buffer, "K_CHECKx"); for (i = 0; i < 6; i++) { buffer[7] = '1'+i; - kp_check[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX); + kp_check[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); } // Eggman warning numbers @@ -8050,20 +8082,20 @@ void K_LoadKartHUDGraphics(void) for (i = 0; i < 4; i++) { buffer[6] = '0'+i; - kp_eggnum[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX); + kp_eggnum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); } // First person mode - kp_fpview[0] = W_CachePatchName("VIEWA0", PU_HUDGFX); - kp_fpview[1] = W_CachePatchName("VIEWB0D0", PU_HUDGFX); - kp_fpview[2] = W_CachePatchName("VIEWC0E0", PU_HUDGFX); + kp_fpview[0] = (patch_t *)W_CachePatchName("VIEWA0", PU_HUDGFX); + kp_fpview[1] = (patch_t *)W_CachePatchName("VIEWB0D0", PU_HUDGFX); + kp_fpview[2] = (patch_t *)W_CachePatchName("VIEWC0E0", PU_HUDGFX); // Input UI Wheel sprintf(buffer, "K_WHEELx"); for (i = 0; i < 5; i++) { buffer[7] = '0'+i; - kp_inputwheel[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX); + kp_inputwheel[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); } // HERE COMES A NEW CHALLENGER @@ -8072,7 +8104,7 @@ void K_LoadKartHUDGraphics(void) { buffer[6] = '0'+((i+1)/10); buffer[7] = '0'+((i+1)%10); - kp_challenger[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX); + kp_challenger[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); } // Lap start animation @@ -8080,7 +8112,7 @@ void K_LoadKartHUDGraphics(void) for (i = 0; i < 7; i++) { buffer[6] = '0'+(i+1); - kp_lapanim_lap[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX); + kp_lapanim_lap[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); } sprintf(buffer, "K_LAPFxx"); @@ -8088,7 +8120,7 @@ void K_LoadKartHUDGraphics(void) { buffer[6] = '0'+((i+1)/10); buffer[7] = '0'+((i+1)%10); - kp_lapanim_final[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX); + kp_lapanim_final[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); } sprintf(buffer, "K_LAPNxx"); @@ -8098,7 +8130,7 @@ void K_LoadKartHUDGraphics(void) for (j = 0; j < 3; j++) { buffer[7] = '0'+(j+1); - kp_lapanim_number[i][j] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX); + kp_lapanim_number[i][j] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); } } @@ -8106,17 +8138,20 @@ void K_LoadKartHUDGraphics(void) for (i = 0; i < 2; i++) { buffer[7] = '0'+(i+1); - kp_lapanim_emblem[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX); + kp_lapanim_emblem[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); } sprintf(buffer, "K_LAPH0x"); for (i = 0; i < 3; i++) { buffer[7] = '0'+(i+1); - kp_lapanim_hand[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX); + kp_lapanim_hand[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX); } - kp_yougotem = (patch_t *) W_CachePatchName("YOUGOTEM", PU_HUDGFX); + kp_yougotem = (patch_t *)W_CachePatchName("YOUGOTEM", PU_HUDGFX); + + if (found_extra_kart || found_extra2_kart || found_extra3_kart) + K_LoadSaturnHUDGraphics(); } // For the item toggle menu @@ -8596,7 +8631,6 @@ static void K_drawKartItem(void) patch_t *localinv = ((offset) ? kp_invincibility[((leveltime % (6*3)) / 3) + 7] : kp_invincibility[(leveltime % (7*3)) / 3]); INT32 fx = 0, fy = 0, fflags = 0; // final coords for hud and flags... - //INT32 splitflags = K_calcSplitFlags(V_SNAPTOTOP|V_SNAPTOLEFT); INT32 numberdisplaymin = cv_huditemamount.value == 2 ? 1 : 2; // No longer a constant so other things can modify this value INT32 itembar = 0; INT32 maxl = 0; // itembar's normal highest value @@ -8606,10 +8640,6 @@ static void K_drawKartItem(void) UINT8 *colmap = NULL; UINT8 *colormap = NULL; - boolean flipamount = splitscreen > 1 && stplyrnum & 1; // Used for 3P/4P splitscreen to flip item amount stuff - - const boolean usemultiicon = (multiitem_icon && cv_multiitemicon.value && !offset); - if (stplyr->kartstuff[k_itemroulette]) { localcolor = K_GetHudColor(); @@ -8744,7 +8774,9 @@ static void K_drawKartItem(void) if (stplyr->kartstuff[k_itemamount] <= 0) return; - switch(stplyr->kartstuff[k_itemtype]) + const boolean usemultiicon = (multiitem_icon && cv_multiitemicon.value && !offset); + + switch (stplyr->kartstuff[k_itemtype]) { case KITEM_SNEAKER: if (usemultiicon) @@ -8815,7 +8847,7 @@ static void K_drawKartItem(void) { if (!cv_huditemamount.value) numberdisplaymin = 3; - localpatch = ((stplyr->kartstuff[k_itemamount] == 1) ? kp_jawz[offset] : kp_multjawz[0]); + localpatch = ((stplyr->kartstuff[k_itemamount] == 1) ? kp_jawz[offset] : kp_multjawz); } else { @@ -8888,6 +8920,8 @@ static void K_drawKartItem(void) fy = info.y; fflags = info.flags; + boolean flipamount = splitscreen > 1 && stplyrnum & 1; // Used for 3P/4P splitscreen to flip item amount stuff + if (K_UseColorHud()) colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE); @@ -8960,7 +8994,6 @@ static void K_drawKartItem(void) // Quick Eggman numbers if (stplyr->kartstuff[k_eggmanexplode] > 1 /*&& stplyr->kartstuff[k_eggmanexplode] <= 3*TICRATE*/) V_DrawScaledPatch(fx+17, fy+13-offset, V_HUDTRANS|fflags, kp_eggnum[min(3, G_TicsToSeconds(stplyr->kartstuff[k_eggmanexplode]))]); - } void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, INT16 emblemmap, UINT8 mode) @@ -8969,6 +9002,7 @@ void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, INT16 emblemmap, UI // TIME_Y = 6; // 6 INT32 splitflags = 0; + if (!mode) { splitflags = V_HUDTRANS|K_calcSplitFlags(V_SNAPTOTOP|V_SNAPTORIGHT); @@ -9115,17 +9149,15 @@ static void K_DrawKartPositionNum(INT32 num) // POSI_Y = BASEVIDHEIGHT- 64; // 136 const boolean wheeloffs = (cv_showinput.value && cv_posi_xoffset.value == 0 && cv_posi_yoffset.value == 0 && cv_wheel_xoffset.value == 0 && cv_wheel_yoffset.value == 0); - boolean win = (stplyr->exiting && num == 1); - //INT32 X = POSI_X; + const boolean win = (stplyr->exiting && num == 1); INT32 W = kp_positionnum[0][0]->width; fixed_t scale = FRACUNIT; patch_t *localpatch = kp_positionnum[0][0]; - //INT32 splitflags = K_calcSplitFlags(V_SNAPTOBOTTOM|V_SNAPTORIGHT); INT32 fx = 0, fy = 0, fflags = 0; - INT32 xoffs = wheeloffs ? -48 : 0; - boolean flipdraw = false; // flip the order we draw it in for MORE splitscreen bs. fun. - boolean flipvdraw = false; // used only for 2p splitscreen so overtaking doesn't make 1P's position fly off the screen. - boolean overtake = false; + const INT32 xoffs = wheeloffs ? -48 : 0; + boolean flipdraw = false; // flip the order we draw it in for MORE splitscreen bs. fun. + boolean flipvdraw = false; // used only for 2p splitscreen so overtaking doesn't make 1P's position fly off the screen. + boolean overtake = false; if ((cv_posanim.value && stplyr->kartstuff[k_positiondelay]) || stplyr->exiting) { @@ -9388,7 +9420,7 @@ void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, I { INT32 i, rightoffset = 240; const UINT8 *colormap; - INT32 dupadjust = cv_betainterscreen.value ? 314 : (vid.width/vid.dupx), duptweak = cv_betainterscreen.value ? -3 : (dupadjust - BASEVIDWIDTH)/2; + const INT32 dupadjust = cv_betainterscreen.value ? 314 : (vid.width/vid.dupx), duptweak = cv_betainterscreen.value ? -3 : (dupadjust - BASEVIDWIDTH)/2; boolean (*_isHighlightedPlayer)(const player_t *) = (demo.playback ? P_IsDisplayPlayer : P_IsLocalPlayer); @@ -9507,9 +9539,9 @@ static boolean K_BigLap(void) static void K_drawKartLaps(void) { - INT32 splitflags = K_calcSplitFlags(V_SNAPTOBOTTOM|V_SNAPTOLEFT); + const INT32 splitflags = K_calcSplitFlags(V_SNAPTOBOTTOM|V_SNAPTOLEFT); INT32 fx = 0, fy = 0, fflags = 0; // stuff for 3p / 4p splitscreen. - boolean flipstring = splitscreen > 1 && stplyrnum & 1; // used for 3p or 4p + const boolean flipstring = splitscreen > 1 && stplyrnum & 1; // used for 3p or 4p INT32 stringw = 0; // used with the above const char *laps; @@ -9605,13 +9637,13 @@ static void K_DrawDialSpeedometer(fixed_t speed, boolean infoactive, boolean colorized) { - UINT8* colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE); + const UINT8* colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE); INT32 rot = 0; - UINT8 infoidx = (infoactive) ? 1 : 0; + const UINT8 infoidx = (infoactive) ? 1 : 0; patch_t* dialpatch; - angle_t speedangle = + const angle_t speedangle = FixedAngle(((min(135 * FRACUNIT, FixedDiv(speed, divisor)) - (45 * FRACUNIT)))); rot = R_GetRollAngle(speedangle); @@ -9870,9 +9902,9 @@ static void K_drawKartSpeedometer(void) static void K_drawKartBumpersOrKarma(void) { - UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE); + const UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE); INT32 fx, fy, fflags; - boolean flipstring = splitscreen > 1 && stplyrnum & 1; // same as laps, used for splitscreen + const boolean flipstring = splitscreen > 1 && stplyrnum & 1; // same as laps, used for splitscreen INT32 stringw = 0; // used with the above const char *bumpval = ""; @@ -10308,13 +10340,13 @@ static void K_drawDriftGauge(void) int i; UINT8 *cmap; - static UINT8 driftcolors[3][4] = { + static const UINT8 driftcolors[3][4] = { {0, 0, 10, 16}, // no drift {215, 215, 204, 253}, // blue {125, 125, 151, 159} // red }; - static UINT8 driftskins[3] = { + static const UINT8 driftskins[3] = { SKINCOLOR_NONE, SKINCOLOR_TEAL, SKINCOLOR_SALMON, @@ -10348,10 +10380,10 @@ skipcrap: fixed_t bary; INT32 BAR_WIDTH; - const INT32 driftval = K_GetKartDriftSparkValue(stplyr); + const INT32 driftval = K_GetKartDriftSparkValue(stplyr); const INT32 driftcharge = min(driftval*4, stplyr->kartstuff[k_driftcharge]); - const INT32 driftlevel = min(driftcharge / driftval, 2); - const INT32 drifttrans = ((cv_driftgaugetrans.value) ? V_LocalTransFlag() : 0); + const INT32 driftlevel = min(driftcharge / driftval, 2); + const INT32 drifttrans = ((cv_driftgaugetrans.value) ? V_LocalTransFlag() : 0); basex = pos.x>>FRACBITS; basey = pos.y>>FRACBITS; @@ -10400,7 +10432,6 @@ skipcrap: } else V_DrawMappedPatch(cv_driftgaugestyle.value == 2 ? basex + dup*11 : basex, basey, V_NOSCALESTART|V_OFFSET|drifttrans, cv_driftgaugestyle.value == 2 ? driftgaugesmall : driftgauge, NULL); - } if (driftcharge >= driftval*4) // rainbow sparks @@ -10557,7 +10588,7 @@ static void K_drawKartPlayerCheck(void) UINT8 *colormap; INT32 x; - INT32 splitflags = K_calcSplitFlags(V_SNAPTOBOTTOM); + const INT32 splitflags = K_calcSplitFlags(V_SNAPTOBOTTOM); if (!stplyr->mo || stplyr->spectator) return; @@ -10699,7 +10730,7 @@ static void K_drawKartMinimapHead(mobj_t *mo, INT32 x, INT32 y, INT32 flags) if (cv_minihead.value) { - amxpos += (minimaphead->width / 4)<width / 4)<height / 4)<cmd; + const ticcmd_t *cmd = &stplyr->cmd; if (timeinmap < 113) { @@ -11336,11 +11364,14 @@ static void K_drawInput(void) if (cv_showinput.value == 2 || cv_showinput.value == 3) { - INT32 joyx, joyxoffs, joyy, joyyoffs, axis; - joyxoffs = -8, joyyoffs = -24; - joyx = x>>FRACBITS, joyy = y>>FRACBITS; + INT32 axis; + INT32 hudforward = 0; // for the stick input display :chaosleep: UINT8 *shadowcolormap = NULL; - const boolean usejoysprite = (cv_showinput.value == 3 && joystickicon); + const INT32 joyx = x>>FRACBITS; + const INT32 joyy = y>>FRACBITS; + static const INT32 joyxoffs = -8; + static const INT32 joyyoffs = -24; + const boolean usejoysprite = (cv_showinput.value == 3 && joystickicon); // O backing if (usejoysprite) @@ -11357,7 +11388,6 @@ static void K_drawInput(void) // time for pain and suffering // kart does not have anything we can get analogue joystick y axis values from // during normal gameplay, so replicate shit here - INT32 hudforward = 0; // for the stick input display :chaosleep: // this is horrid but we cant get actual input in replays so uhh if (demo.playback || !P_IsLocalPlayer(stplyr)) // yeah........... @@ -11388,9 +11418,9 @@ static void K_drawInput(void) hudforward-= KART_FULLTURN; } } - } - hudforward = CLAMP(hudforward, -KART_FULLTURN, KART_FULLTURN); + hudforward = CLAMP(hudforward, -KART_FULLTURN, KART_FULLTURN); + } if (cmd->driftturn || hudforward) { @@ -11464,7 +11494,7 @@ static void K_drawInput(void) static void K_drawChallengerScreen(void) { // This is an insanely complicated animation. - static UINT8 anim[52] = { + static const UINT8 anim[52] = { 0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13, // frame 1-14, 2 tics: HERE COMES A NEW slides in 14,14,14,14,14,14, // frame 15, 6 tics: pause on the W 15,16,17,18, // frame 16-19, 1 tic: CHALLENGER approaches screen @@ -11534,7 +11564,7 @@ void K_drawKartFreePlay(UINT32 flashtime) { // no splitscreen support because it's not FREE PLAY if you have more than one player in-game - if (! cv_showfreeplay.value) + if (!cv_showfreeplay.value) return; if ((flashtime % TICRATE) < TICRATE/2) From 7ef2da592289a35ca99a1b96d5ac393c28ebc812 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 29 Jun 2025 11:43:23 +0200 Subject: [PATCH 5/5] tiny cleanup hw_batching --- src/hardware/hw_batching.c | 103 +++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 51 deletions(-) diff --git a/src/hardware/hw_batching.c b/src/hardware/hw_batching.c index 801442b6f..6e9ac4d7b 100644 --- a/src/hardware/hw_batching.c +++ b/src/hardware/hw_batching.c @@ -25,22 +25,23 @@ GLMipmap_t *current_texture = NULL; boolean currently_batching = false; -FOutVector* finalVertexArray = NULL;// contains subset of sorted vertices and texture coordinates to be sent to gpu +FOutVector* finalVertexArray = NULL;// contains subset of sorted vertices and texture coordinates to be sent to gpu UINT32* finalVertexIndexArray = NULL;// contains indexes for glDrawElements, taking into account fan->triangles conversion // NOTE have this alloced as 3x finalVertexArray size int finalVertexArrayAllocSize = 65536; + //GLubyte* colorArray = NULL;// contains color data to be sent to gpu, if needed //int colorArrayAllocSize = 65536; // not gonna use this for now, just sort by color and change state when it changes // later maybe when using vertex attributes if it's needed -PolygonArrayEntry* polygonArray = NULL;// contains the polygon data from DrawPolygon, waiting to be processed -int polygonArraySize = 0; -PolygonArrayEntry **polygonArraySorted = NULL;// contains sorted pointers to polygonArray +PolygonArrayEntry* polygonArray = NULL ;// contains the polygon data from DrawPolygon, waiting to be processed +PolygonArrayEntry **polygonArraySorted = NULL; // contains sorted pointers to polygonArray +int polygonArraySize = 0; int polygonArrayAllocSize = 65536; -FOutVector* unsortedVertexArray = NULL;// contains unsorted vertices and texture coordinates from DrawPolygon -int unsortedVertexArraySize = 0; +FOutVector* unsortedVertexArray = NULL; // contains unsorted vertices and texture coordinates from DrawPolygon +int unsortedVertexArraySize = 0; int unsortedVertexArrayAllocSize = 65536; // Enables batching mode. HWR_ProcessPolygon will collect polygons instead of passing them directly to the rendering backend. @@ -55,11 +56,11 @@ void HWR_StartBatching(void) // init arrays if that has not been done yet if (!finalVertexArray) { - finalVertexArray = malloc(finalVertexArrayAllocSize * sizeof(FOutVector)); + finalVertexArray = malloc(finalVertexArrayAllocSize * sizeof(FOutVector)); finalVertexIndexArray = malloc(finalVertexArrayAllocSize * 3 * sizeof(UINT32)); - polygonArray = malloc(polygonArrayAllocSize * sizeof(PolygonArrayEntry)); - polygonArraySorted = malloc(polygonArrayAllocSize * sizeof(PolygonArrayEntry *)); - unsortedVertexArray = malloc(unsortedVertexArrayAllocSize * sizeof(FOutVector)); + polygonArray = malloc(polygonArrayAllocSize * sizeof(PolygonArrayEntry)); + polygonArraySorted = malloc(polygonArrayAllocSize * sizeof(PolygonArrayEntry *)); + unsortedVertexArray = malloc(unsortedVertexArrayAllocSize * sizeof(FOutVector)); } currently_batching = true; @@ -132,13 +133,13 @@ void HWR_ProcessPolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPt static int comparePolygons(const void *p1, const void *p2) { - const PolygonArrayEntry *poly1 = *(PolygonArrayEntry *const *)p1; - const PolygonArrayEntry *poly2 = *(PolygonArrayEntry *const *)p2; int diff; INT64 diff64; + const PolygonArrayEntry *poly1 = *(PolygonArrayEntry *const *)p1; + const PolygonArrayEntry *poly2 = *(PolygonArrayEntry *const *)p2; - int shader1 = (poly1->polyFlags & PF_NoTexture || poly1->horizonSpecial) ? -1 : poly1->shader; - int shader2 = (poly2->polyFlags & PF_NoTexture || poly2->horizonSpecial) ? -1 : poly2->shader; + const int shader1 = (poly1->polyFlags & PF_NoTexture || poly1->horizonSpecial) ? -1 : poly1->shader; + const int shader2 = (poly2->polyFlags & PF_NoTexture || poly2->horizonSpecial) ? -1 : poly2->shader; // skywalls and horizon lines must retain their order for horizon lines to work if (shader1 == -1 && shader2 == -1) @@ -174,13 +175,13 @@ static int comparePolygons(const void *p1, const void *p2) static int comparePolygonsNoShaders(const void *p1, const void *p2) { - PolygonArrayEntry *poly1 = *(PolygonArrayEntry *const *)p1; - PolygonArrayEntry *poly2 = *(PolygonArrayEntry *const *)p2; int diff; INT64 diff64; + const PolygonArrayEntry *poly1 = *(PolygonArrayEntry *const *)p1; + const PolygonArrayEntry *poly2 = *(PolygonArrayEntry *const *)p2; - GLMipmap_t *texture1 = (poly1->polyFlags & PF_NoTexture || poly1->horizonSpecial) ? NULL : poly1->texture; - GLMipmap_t *texture2 = (poly2->polyFlags & PF_NoTexture || poly2->horizonSpecial) ? NULL : poly2->texture; + const GLMipmap_t *texture1 = (poly1->polyFlags & PF_NoTexture || poly1->horizonSpecial) ? NULL : poly1->texture; + const GLMipmap_t *texture2 = (poly2->polyFlags & PF_NoTexture || poly2->horizonSpecial) ? NULL : poly2->texture; // skywalls and horizon lines must retain their order for horizon lines to work if (!texture1 && !texture2) @@ -204,17 +205,16 @@ static int comparePolygonsNoShaders(const void *p1, const void *p2) // the rendering backend to draw them. void HWR_RenderBatches(void) { - int finalVertexWritePos = 0;// position in finalVertexArray - int finalIndexWritePos = 0;// position in finalVertexIndexArray - - int polygonReadPos = 0;// position in polygonArraySorted + int finalVertexWritePos = 0; // position in finalVertexArray + int finalIndexWritePos = 0; // position in finalVertexIndexArray + int polygonReadPos = 0; // position in polygonArraySorted int currentShader; int nextShader = 0; - GLMipmap_t *currentTexture = NULL; - GLMipmap_t *nextTexture = NULL; - FBITFIELD currentPolyFlags = 0; - FBITFIELD nextPolyFlags = 0; + GLMipmap_t *currentTexture = NULL; + GLMipmap_t *nextTexture = NULL; + FBITFIELD currentPolyFlags = 0; + FBITFIELD nextPolyFlags = 0; FSurfaceInfo currentSurfaceInfo; FSurfaceInfo nextSurfaceInfo; @@ -225,8 +225,8 @@ void HWR_RenderBatches(void) I_Error("HWR_RenderBatches called without starting batching"); } - nextSurfaceInfo.LightInfo.fade_end = 0; - nextSurfaceInfo.LightInfo.fade_start = 0; + nextSurfaceInfo.LightInfo.fade_end = 0; + nextSurfaceInfo.LightInfo.fade_start = 0; nextSurfaceInfo.LightInfo.light_level = 0; nextSurfaceInfo.LightInfo.directional = false; @@ -244,7 +244,7 @@ void HWR_RenderBatches(void) ps_hw_numpolys.value.i = polygonArraySize; ps_hw_numcalls.value.i = ps_hw_numverts.value.i = 0; ps_hw_numshaders.value.i = ps_hw_numtextures.value.i - = ps_hw_numpolyflags.value.i = ps_hw_numcolors.value.i = 1; + = ps_hw_numpolyflags.value.i = ps_hw_numcolors.value.i = 1; // init polygonArraySorted for (i = 0; i < polygonArraySize; i++) @@ -254,10 +254,7 @@ void HWR_RenderBatches(void) // sort polygons PS_START_TIMING(ps_hw_batchsorttime); - if (cv_glshaders.value && gl_shadersavailable) - qs22j(polygonArraySorted, polygonArraySize, sizeof(PolygonArrayEntry *), comparePolygons); - else - qs22j(polygonArraySorted, polygonArraySize, sizeof(PolygonArrayEntry *), comparePolygonsNoShaders); + qs22j(polygonArraySorted, polygonArraySize, sizeof(PolygonArrayEntry *), (HWR_UseShader() ? comparePolygons : comparePolygonsNoShaders)); PS_STOP_TIMING(ps_hw_batchsorttime); // sort order @@ -269,16 +266,16 @@ void HWR_RenderBatches(void) PS_START_TIMING(ps_hw_batchdrawtime); - currentShader = polygonArraySorted[0]->shader; - currentTexture = polygonArraySorted[0]->texture; - currentPolyFlags = polygonArraySorted[0]->polyFlags; + currentShader = polygonArraySorted[0]->shader; + currentTexture = polygonArraySorted[0]->texture; + currentPolyFlags = polygonArraySorted[0]->polyFlags; currentSurfaceInfo = polygonArraySorted[0]->surf; // For now, will sort and track the colors. Vertex attributes could be used instead of uniforms // and a color array could replace the color calls. // set state for first batch - if (cv_glshaders.value && gl_shadersavailable) + if (HWR_UseShader()) { GL_SetShader(currentShader); } @@ -303,16 +300,17 @@ void HWR_RenderBatches(void) // steps: // write vertices // check for changes or end, otherwise go back to writing - // changes will affect the next vars and the change bools - // end could set flag for stopping + // changes will affect the next vars and the change bools + // end could set flag for stopping // execute draw call // could check ending flag here // change states according to next vars and change bools, updating the current vars and reseting the bools // reset write pos // repeat loop - PolygonArrayEntry *entry = polygonArraySorted[polygonReadPos++]; - int numVerts = entry->numVerts; + const PolygonArrayEntry *entry = polygonArraySorted[polygonReadPos++]; + const int numVerts = entry->numVerts; + // before writing, check if there is enough room // using 'while' instead of 'if' here makes sure that there will *always* be enough room. // probably never will this loop run more than once though @@ -324,13 +322,15 @@ void HWR_RenderBatches(void) // going from fans to triangles increases vertex count to 3x finalVertexIndexArray = realloc(finalVertexIndexArray, finalVertexArrayAllocSize * 3 * sizeof(UINT32)); } + // write the vertices of the polygon - memcpy(&finalVertexArray[finalVertexWritePos], &unsortedVertexArray[entry->vertsIndex], - numVerts * sizeof(FOutVector)); + memcpy(&finalVertexArray[finalVertexWritePos], &unsortedVertexArray[entry->vertsIndex], numVerts * sizeof(FOutVector)); + // write the indexes, pointing to the fan vertexes but in triangles format firstIndex = finalVertexWritePos; lastIndex = finalVertexWritePos + numVerts; finalVertexWritePos += 2; + while (finalVertexWritePos < lastIndex) { finalVertexIndexArray[finalIndexWritePos++] = firstIndex; @@ -345,16 +345,16 @@ void HWR_RenderBatches(void) else { // check if a state change is required, set the change bools and next vars - PolygonArrayEntry *nextEntry = polygonArraySorted[polygonReadPos]; - nextShader = nextEntry->shader; - nextTexture = nextEntry->texture; - nextPolyFlags = nextEntry->polyFlags; + const PolygonArrayEntry *nextEntry = polygonArraySorted[polygonReadPos]; + nextShader = nextEntry->shader; + nextTexture = nextEntry->texture; + nextPolyFlags = nextEntry->polyFlags; nextSurfaceInfo = nextEntry->surf; if (nextPolyFlags & PF_NoTexture) nextTexture = 0; - if (currentShader != nextShader && cv_glshaders.value && gl_shadersavailable) + if (currentShader != nextShader && HWR_UseShader()) { changeState = true; changeShader = true; @@ -372,7 +372,7 @@ void HWR_RenderBatches(void) changePolyFlags = true; } - if (cv_glshaders.value && gl_shadersavailable) + if (HWR_UseShader()) { if (currentSurfaceInfo.PolyColor.rgba != nextSurfaceInfo.PolyColor.rgba || currentSurfaceInfo.TintColor.rgba != nextSurfaceInfo.TintColor.rgba || @@ -405,7 +405,7 @@ void HWR_RenderBatches(void) ps_hw_numverts.value.i += finalIndexWritePos; // reset write positions finalVertexWritePos = 0; - finalIndexWritePos = 0; + finalIndexWritePos = 0; } else continue; @@ -451,9 +451,10 @@ void HWR_RenderBatches(void) ps_hw_numcolors.value.i++; } - // and that should be it? } + // and that should be it? } + // reset the arrays (set sizes to 0) polygonArraySize = 0; unsortedVertexArraySize = 0;