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 'trick-control-lock' of https://git.do.srb2.org/KartKrew/Kart into catholic-vfx

Browse source 
# Conflicts:
#	src/k_kart.c
This commit is contained in:
toaster 2023-11-07 22:24:53 +00:00
commit 2e760eff43
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/k_kart.c
View file

@ -9580,9 +9580,9 @@ INT16 K_GetKartTurnValue(player_t *player, INT16 turnvalue)
return 0;
}
if (player->trickpanel != 0 && player->trickpanel < 4)
if (player->trickpanel == 1 || player->trickpanel == 5)
{
// No turning during trick panel unless you did the upwards trick (4)
// Forward trick or rising from trickpanel
return 0;
}
@ -9678,6 +9678,12 @@ INT16 K_GetKartTurnValue(player_t *player, INT16 turnvalue)
// Weight has a small effect on turning
turnfixed = FixedMul(turnfixed, weightadjust);
// Side trick
if (player->trickpanel == 2 || player->trickpanel == 3)
{
turnfixed /= 2;
}
return (turnfixed / FRACUNIT);
}
@ -12194,7 +12200,6 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
angle_t tornadotrickspeed = ANG30;
const angle_t angledelta = FixedAngle(36*FRACUNIT);
angle_t baseangle = player->mo->angle + angledelta/2;
boolean fronttrick = false;
INT16 aimingcompare = abs(cmd->throwdir) - abs(cmd->turning);
@ -12247,7 +12252,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
}
P_InstaThrust(player->mo, player->mo->angle, max(basespeed, speed*3));
player->trickpanel = 2;
player->trickpanel = 5;
if (P_MobjWasRemoved(player->trickIndicator) == false)
{
@ -12255,8 +12260,6 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
}
P_SetPlayerMobjState(player->mo, S_KART_FAST);
fronttrick = true;
}
else if (cmd->throwdir < 0) // back trick
{
@ -12303,7 +12306,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
INT32 j;
if (fronttrick == true)
if (player->trickpanel == 5)
; // Not yet sprited
else for (j = 0; j < 8; j++, baseangle += angledelta)
{

4
src/p_user.c
View file

@ -2467,11 +2467,11 @@ void P_MovePlayer(player_t *player)
}
else
{
if (player->trickpanel == 2)
if (player->trickpanel == 2 || player->trickpanel == 5) // right/forward
{
player->drawangle += ANGLE_22h;
}
else if (player->trickpanel >= 3)
else if (player->trickpanel == 3 || player->trickpanel == 4) // left/back
{
player->drawangle -= ANGLE_22h;
}