thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Call K_trickPanelTimingVisual only once per tic, to prevent pie duplication

Browse source
This commit is contained in:
toaster 2023-11-06 19:12:26 +00:00
parent 2f62c0ff6b
commit e412b6ddd8
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/k_kart.c
View file

@ -12097,8 +12097,6 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
fixed_t basespeed = FixedMul(invertscale, K_GetKartSpeed(player, false, false)); // at WORSE, keep your normal speed when tricking. fixed_t basespeed = FixedMul(invertscale, K_GetKartSpeed(player, false, false)); // at WORSE, keep your normal speed when tricking.
fixed_t speed = FixedMul(invertscale, FixedMul(speedmult, P_AproxDistance(player->mo->momx, player->mo->momy))); fixed_t speed = FixedMul(invertscale, FixedMul(speedmult, P_AproxDistance(player->mo->momx, player->mo->momy)));
K_trickPanelTimingVisual(player, momz);
if (P_MobjWasRemoved(player->trickIndicator) == false) if (P_MobjWasRemoved(player->trickIndicator) == false)
{ {
player->trickIndicator->destscale = FixedMul(speedmult + FRACUNIT, mapobjectscale); player->trickIndicator->destscale = FixedMul(speedmult + FRACUNIT, mapobjectscale);
@ -12148,7 +12146,6 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
player->pflags &= ~PF_TUMBLESOUND; player->pflags &= ~PF_TUMBLESOUND;
player->tumbleHeight = 30; // Base tumble bounce height player->tumbleHeight = 30; // Base tumble bounce height
player->trickpanel = 0; player->trickpanel = 0;
K_trickPanelTimingVisual(player, momz); // fail trick visual
P_SetPlayerMobjState(player->mo, S_KART_SPINOUT); P_SetPlayerMobjState(player->mo, S_KART_SPINOUT);
if (player->pflags & (PF_ITEMOUT|PF_EGGMANOUT)) if (player->pflags & (PF_ITEMOUT|PF_EGGMANOUT))
{ {
@ -12236,8 +12233,6 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
player->mo->hitlag = TRICKLAG; player->mo->hitlag = TRICKLAG;
player->mo->eflags &= ~MFE_DAMAGEHITLAG; player->mo->eflags &= ~MFE_DAMAGEHITLAG;
K_trickPanelTimingVisual(player, momz);
if (abs(momz) < FRACUNIT*99) // Let's use that as baseline for PERFECT trick. if (abs(momz) < FRACUNIT*99) // Let's use that as baseline for PERFECT trick.
{ {
player->karthud[khud_trickcool] = TICRATE; player->karthud[khud_trickcool] = TICRATE;
@ -12260,6 +12255,8 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
} }
} }
} }
K_trickPanelTimingVisual(player, momz);
} }
else if (player->trickpanel == 4 && P_IsObjectOnGround(player->mo)) // Upwards trick landed! else if (player->trickpanel == 4 && P_IsObjectOnGround(player->mo)) // Upwards trick landed!
{ {