diff --git a/src/k_hud.c b/src/k_hud.c index b998a8dc9..eb00068d9 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 cd2f609b1..2b3a1e552 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -5409,47 +5409,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 045fd9450..def1385ad 100644 --- a/src/k_kart.h +++ b/src/k_kart.h @@ -42,7 +42,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"