From 940327210fd21b737d441cd753921c115a1d2c91 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 24 Nov 2025 00:35:04 +0100 Subject: [PATCH 1/2] p_setup: move interpolator reset into P_FreeLevelState --- src/p_setup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/p_setup.c b/src/p_setup.c index cdba28bf3..4c49b6f50 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -2719,6 +2719,9 @@ void P_FreeLevelState(void) // clear the splats from previous level R_ClearLevelSplats(); #endif + + R_InitMobjInterpolators(); + R_InitializeLevelInterpolators(); } /** Loads a level from a lump or external wad. @@ -2828,10 +2831,7 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate) P_FreeLevelState(); - R_InitializeLevelInterpolators(); - P_InitThinkers(); - R_InitMobjInterpolators(); P_InitCachedActions(); // internal game map From 2a823ecd60476140cae2840bdce47e6469284072 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 24 Nov 2025 00:34:31 +0100 Subject: [PATCH 2/2] move K_KartPlayerHUDUpdate to k_hud how tf did i miss that lul --- src/k_hud.c | 43 +++++++++++++++++++++++++++++++++++++++++++ src/k_hud.h | 2 ++ src/k_kart.c | 41 ----------------------------------------- src/k_kart.h | 1 - src/p_user.c | 1 + 5 files changed, 46 insertions(+), 42 deletions(-) diff --git a/src/k_hud.c b/src/k_hud.c index 7a58a5390..fa2ea7b31 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -1076,6 +1076,49 @@ static void K_initKartHUD(void) R_InterpolateView(R_GetTimeFrac(RTF_CAMERA), !cv_uncappedhud.value); } +void K_KartPlayerHUDUpdate(player_t *player) +{ + if (player->kartstuff[k_lapanimation]) + player->kartstuff[k_lapanimation]--; + + if (player->kartstuff[k_yougotem]) + player->kartstuff[k_yougotem]--; + + if (G_BattleGametype() && (player->exiting || player->kartstuff[k_comebacktimer])) + { + if (player->exiting) + { + if (player->exiting < 6*TICRATE) + player->kartstuff[k_cardanimation] += ((164-player->kartstuff[k_cardanimation])/8)+1; + else if (player->exiting == 6*TICRATE) + player->kartstuff[k_cardanimation] = 0; + else if (player->kartstuff[k_cardanimation] < 2*TICRATE) + player->kartstuff[k_cardanimation]++; + } + else + { + if (player->kartstuff[k_comebacktimer] < 6*TICRATE) + player->kartstuff[k_cardanimation] -= ((164-player->kartstuff[k_cardanimation])/8)+1; + else if (player->kartstuff[k_comebacktimer] < 9*TICRATE) + player->kartstuff[k_cardanimation] += ((164-player->kartstuff[k_cardanimation])/8)+1; + } + + if (player->kartstuff[k_cardanimation] > 164) + player->kartstuff[k_cardanimation] = 164; + if (player->kartstuff[k_cardanimation] < 0) + player->kartstuff[k_cardanimation] = 0; + } + else if (G_RaceGametype() && player->exiting) + { + if (player->kartstuff[k_cardanimation] < 2*TICRATE) + player->kartstuff[k_cardanimation]++; + } + else + { + player->kartstuff[k_cardanimation] = 0; + } +} + UINT8 K_GetHudColor(void) { if (cv_colorizedhud.value && cv_colorizedhudcolor.value) diff --git a/src/k_hud.h b/src/k_hud.h index 3d2e478a7..167a89e6a 100644 --- a/src/k_hud.h +++ b/src/k_hud.h @@ -52,6 +52,8 @@ extern CV_PossibleValue_t inputdisplay_cons_t[NUMINPUTDISPLAYSTUFF]; #define NUMMINIMAPDOTSTUFF 5 extern CV_PossibleValue_t minimapdot_cons_t[NUMMINIMAPDOTSTUFF]; +void K_KartPlayerHUDUpdate(player_t *player); + const char *K_GetItemPatch(UINT8 item, boolean tiny); INT32 K_calcSplitFlags(INT32 snapflags); void K_LoadKartHUDGraphics(void); diff --git a/src/k_kart.c b/src/k_kart.c index f2e8385f3..a73560fdc 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -5327,47 +5327,6 @@ static void K_UpdateInvincibilitySounds(player_t *player) #undef STOPTHIS } -void K_KartPlayerHUDUpdate(player_t *player) -{ - if (player->kartstuff[k_lapanimation]) - player->kartstuff[k_lapanimation]--; - - if (player->kartstuff[k_yougotem]) - player->kartstuff[k_yougotem]--; - - if (G_BattleGametype() && (player->exiting || player->kartstuff[k_comebacktimer])) - { - if (player->exiting) - { - if (player->exiting < 6*TICRATE) - player->kartstuff[k_cardanimation] += ((164-player->kartstuff[k_cardanimation])/8)+1; - else if (player->exiting == 6*TICRATE) - player->kartstuff[k_cardanimation] = 0; - else if (player->kartstuff[k_cardanimation] < 2*TICRATE) - player->kartstuff[k_cardanimation]++; - } - else - { - if (player->kartstuff[k_comebacktimer] < 6*TICRATE) - player->kartstuff[k_cardanimation] -= ((164-player->kartstuff[k_cardanimation])/8)+1; - else if (player->kartstuff[k_comebacktimer] < 9*TICRATE) - player->kartstuff[k_cardanimation] += ((164-player->kartstuff[k_cardanimation])/8)+1; - } - - if (player->kartstuff[k_cardanimation] > 164) - player->kartstuff[k_cardanimation] = 164; - if (player->kartstuff[k_cardanimation] < 0) - player->kartstuff[k_cardanimation] = 0; - } - else if (G_RaceGametype() && player->exiting) - { - if (player->kartstuff[k_cardanimation] < 2*TICRATE) - player->kartstuff[k_cardanimation]++; - } - else - player->kartstuff[k_cardanimation] = 0; -} - boolean K_PlayerEffectsShouldBlend(player_t *player) { if (!cv_playerblendeffects.value || !player->mo) diff --git a/src/k_kart.h b/src/k_kart.h index 8dd9435ab..ab0d8bd14 100644 --- a/src/k_kart.h +++ b/src/k_kart.h @@ -41,7 +41,6 @@ void K_FlipFromObject(mobj_t *mo, mobj_t *master); void K_MatchGenericExtraFlags(mobj_t *mo, mobj_t *master); void K_RespawnChecker(player_t *player); void K_KartMoveAnimation(player_t *player); -void K_KartPlayerHUDUpdate(player_t *player); boolean K_PlayerEffectsShouldBlend(player_t *player); void K_KartPlayerThink(player_t *player, ticcmd_t *cmd); void K_KartPlayerAfterThink(player_t *player); diff --git a/src/p_user.c b/src/p_user.c index bd2a87f2f..5cff67f4b 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -47,6 +47,7 @@ // SRB2kart #include "m_cond.h" // M_UpdateUnlockablesAndExtraEmblems #include "k_kart.h" +#include "k_hud.h" #include "console.h" // CON_LogMessage #include "m_menu.h"