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: Slight cleanup on e0e459216d.

Browse source
This commit is contained in:
Mitchell Richters 2023-09-27 13:47:05 +10:00
parent 4958241c57
commit ae39645169
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/games/duke/src/input.cpp
View file

@ -516,24 +516,21 @@ void GameInterface::doPlayerMovement(const float scaleAdjust)
if (isRRRA() && (p->OnMotorcycle || p->OnBoat)) if (isRRRA() && (p->OnMotorcycle || p->OnBoat))
{ {
static constexpr float VEHICLETURN = (20.f * 360.f / 2048.f); static constexpr float VEHICLETURN = (20.f * 360.f / 2048.f);
float baseVel, velScale; float baseVel, velScale; unsigned vehFlags;
if (p->OnMotorcycle) if (p->OnMotorcycle)
{ {
vehFlags = VEH_CANTURN | (VEH_CANMOVE * !p->moto_underwater) | (VEH_SCALETURN * (p->MotoSpeed <= 0));
velScale = (3.f / 10.f); velScale = (3.f / 10.f);
baseVel = VEHICLETURN * Sgn(p->MotoSpeed); baseVel = VEHICLETURN * Sgn(p->MotoSpeed);
} }
else else
{ {
vehFlags = VEH_CANMOVE | (VEH_CANTURN * (p->MotoSpeed || p->moto_drink));
velScale = !p->NotOnWater? 1.f : (6.f / 19.f); velScale = !p->NotOnWater? 1.f : (6.f / 19.f);
baseVel = VEHICLETURN * velScale; baseVel = VEHICLETURN * velScale;
} }
unsigned vehFlags = 0;
vehFlags |= VEH_CANMOVE * (p->OnBoat || !p->moto_underwater);
vehFlags |= VEH_CANTURN * (p->OnMotorcycle || p->MotoSpeed || p->moto_drink);
vehFlags |= VEH_SCALETURN * (p->OnMotorcycle && p->MotoSpeed <= 0);
gameInput.processVehicle(&p->Angles, scaleAdjust, baseVel, velScale, vehFlags); gameInput.processVehicle(&p->Angles, scaleAdjust, baseVel, velScale, vehFlags);
} }
else else