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

Merge branch 'no-trick-input-filter' into 'master'

Browse source 
No trick input filter

Closes #1396

See merge request KartKrew/Kart!2388
This commit is contained in:
Oni 2024-05-20 21:20:27 +00:00
commit 4b437e9a03
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/k_kart.c
View file

@ -13630,15 +13630,28 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
const angle_t angledelta = FixedAngle(36*FRACUNIT);
angle_t baseangle = player->mo->angle + angledelta/2;
// Old ambiguous-input filter, no longer needed for 2.2 tricks
// INT16 aimingcompare = abs(cmd->throwdir) - abs(cmd->turning);
boolean cantrick = true;
UINT16 buttons = player->cmd.buttons;
INT16 aimingcompare = abs(cmd->throwdir) - abs(cmd->turning);
INT16 TRICKTHRESHOLD = 2*KART_FULLTURN/3;
// 2.3 - aimingcompare
if (!!G_CompatLevel(0x000C))
{
TRICKTHRESHOLD = KART_FULLTURN/2;
INT16 aimingcompare = abs(cmd->throwdir) - abs(cmd->turning);
if (abs(aimingcompare) < TRICKTHRESHOLD)
cantrick = false;
}
// 2.2 - Pre-steering trickpanels
if (!G_CompatLevel(0x000A) && !K_PlayerUsesBotMovement(player))
{
if (!(buttons & BT_ACCELERATE))
{
aimingcompare = 0;
cantrick = false;
}
// 2.3 - also allow tricking with the Spindash button
else if (!G_CompatLevel(0x000C) && ((buttons & BT_SPINDASHMASK) == BT_SPINDASHMASK))
@ -13648,8 +13661,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
}
// Uses cmd->turning over steering intentionally.
#define TRICKTHRESHOLD (KART_FULLTURN/2)
if (aimingcompare < -TRICKTHRESHOLD) // side trick
if (cantrick && abs(cmd->turning) > TRICKTHRESHOLD) // side trick
{
S_StartSoundAtVolume(player->mo, sfx_trick0, 255/2);
player->dotrickfx = true;
@ -13688,7 +13700,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
P_SetPlayerMobjState(player->mo, S_KART_FAST_LOOK_R);
}
}
else if (aimingcompare > TRICKTHRESHOLD) // forward/back trick
else if (cantrick && abs(cmd->throwdir) > TRICKTHRESHOLD) // forward/back trick
{
S_StartSoundAtVolume(player->mo, sfx_trick0, 255/2);
player->dotrickfx = true;
@ -13740,7 +13752,6 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
P_SetPlayerMobjState(player->mo, S_KART_FAST);
}
}
#undef TRICKTHRESHOLD
// Finalise everything.
if (player->trickpanel != TRICKSTATE_READY) // just changed from 1?