zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-04-03 06:20:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Blood: Fix view rolling while underwater.

Browse source
This commit is contained in:
Mitchell Richters 2023-09-24 20:00:11 +10:00
parent 8d8c30d10e
commit 2916fe596f
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
source/games/blood/src/actor.cpp
View file

@ -5142,23 +5142,24 @@ void MoveDude(DBloodActor* actor)
return;
}
}
if (IsUnderwaterSector(actor->sector()))
return;
if (actor->xspr.height >= 0x100)
return;
int nDrag = gDudeDrag;
if (actor->xspr.height > 0)
nDrag -= Scale(gDudeDrag, actor->xspr.height, 256);
// this cannot be floatified due to the effect of mulscale16r on the value.
actor->vel.X += FixedToFloat(-mulscale16r(FloatToFixed(actor->vel.X), nDrag));
actor->vel.Y += FixedToFloat(-mulscale16r(FloatToFixed(actor->vel.Y), nDrag));
if (pPlayer)
{
pPlayer->Angles.StrafeVel += FixedToFloat(-mulscale16r(FloatToFixed(pPlayer->Angles.StrafeVel), nDrag));
}
if (IsUnderwaterSector(actor->sector()))
return;
if (actor->xspr.height >= 0x100)
return;
// this cannot be floatified due to the effect of mulscale16r on the value.
actor->vel.X += FixedToFloat(-mulscale16r(FloatToFixed(actor->vel.X), nDrag));
actor->vel.Y += FixedToFloat(-mulscale16r(FloatToFixed(actor->vel.Y), nDrag));
if (actor->vel.XY().Length() < 0.0625)
{
actor->vel.XY().Zero();