zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke/RR: Ensure braking sync bit is always cleared in onBoat().

Browse source
This commit is contained in:
Mitchell Richters 2023-03-20 21:07:50 +11:00
parent 9c65d2cde1
commit 134b635966
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
source/games/duke/src/player_r.cpp
View file

@ -1470,7 +1470,7 @@ static void onMotorcycle(int snum, ESyncBits &actions)
bool braking = false;
int rng;
if (p->moto_underwater)
if (p->MotoSpeed < 0 || p->moto_underwater)
p->MotoSpeed = 0;
bool forward = p->sync.fvel > 0;
@ -1478,15 +1478,12 @@ static void onMotorcycle(int snum, ESyncBits &actions)
bool turnLeft = p->sync.avel < 0;
bool turnRight = p->sync.avel > 0;
if (p->MotoSpeed < 0)
p->MotoSpeed = 0;
if ((braking = actions & SB_CROUCH))
{
actions &= ~SB_CROUCH;
}
if (forward != 0)
if (forward)
{
if (p->on_ground)
{
@ -1743,10 +1740,16 @@ static void onBoat(int snum, ESyncBits &actions)
if (p->MotoSpeed < 0)
p->MotoSpeed = 0;
if ((actions & SB_CROUCH) && forward)
if ((braking = actions & SB_CROUCH))
{
actions &= ~SB_CROUCH;
}
if (braking && forward)
{
heeltoe = true;
forward = false;
braking = false;
}
if (forward)
@ -1780,11 +1783,6 @@ static void onBoat(int snum, ESyncBits &actions)
S_PlayActorSound(87, pact);
}
if ((braking = actions & SB_CROUCH))
{
actions &= ~SB_CROUCH;
}
if (turnLeft && !S_CheckActorSoundPlaying(pact, 91) && p->MotoSpeed > 30 && !p->NotOnWater)
S_PlayActorSound(91, pact);