- Duke/RR: Convert remaining vehicle function local ints to bools where appropriate.

This commit is contained in:
Mitchell Richters 2020-11-05 10:15:55 +11:00
parent c223a50b29
commit 1545610501

View file

@ -1573,17 +1573,17 @@ static void onMotorcycle(int snum, ESyncBits &actions)
auto pact = p->GetActor(); auto pact = p->GetActor();
auto s = &pact->s; auto s = &pact->s;
int braking; bool braking;
short rng; short rng;
if (p->MotoSpeed < 0) if (p->MotoSpeed < 0)
p->MotoSpeed = 0; p->MotoSpeed = 0;
if (actions & SB_CROUCH) if (actions & SB_CROUCH)
{ {
braking = 1; braking = true;
actions &= ~SB_CROUCH; actions &= ~SB_CROUCH;
} }
else else
braking = 0; braking = false;
if (p->vehForwardScale != 0) if (p->vehForwardScale != 0)
{ {
@ -1842,7 +1842,7 @@ static void onBoat(int snum, ESyncBits &actions)
auto pact = p->GetActor(); auto pact = p->GetActor();
auto s = &pact->s; auto s = &pact->s;
int heeltoe, braking; bool heeltoe, braking;
short rng; short rng;
if (p->NotOnWater) if (p->NotOnWater)
{ {
@ -1861,13 +1861,13 @@ static void onBoat(int snum, ESyncBits &actions)
p->MotoSpeed = 0; p->MotoSpeed = 0;
if ((actions & SB_CROUCH) && (p->vehForwardScale != 0)) if ((actions & SB_CROUCH) && (p->vehForwardScale != 0))
{ {
heeltoe = 1; heeltoe = true;
braking = 0; braking = false;
p->vehForwardScale = 0; p->vehForwardScale = 0;
actions &= ~SB_CROUCH; actions &= ~SB_CROUCH;
} }
else else
heeltoe = 0; heeltoe = false;
if (p->vehForwardScale != 0) if (p->vehForwardScale != 0)
{ {
if (p->MotoSpeed == 0 && !S_CheckActorSoundPlaying(pact, 89)) if (p->MotoSpeed == 0 && !S_CheckActorSoundPlaying(pact, 89))
@ -1901,11 +1901,11 @@ static void onBoat(int snum, ESyncBits &actions)
if (actions & SB_CROUCH) if (actions & SB_CROUCH)
{ {
braking = 1; braking = true;
actions &= ~SB_CROUCH; actions &= ~SB_CROUCH;
} }
else else
braking = 0; braking = false;
if (p->vehTurnLeft) if (p->vehTurnLeft)
{ {
if (!S_CheckActorSoundPlaying(pact, 91) && p->MotoSpeed > 30 && !p->NotOnWater) if (!S_CheckActorSoundPlaying(pact, 91) && p->MotoSpeed > 30 && !p->NotOnWater)