teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-02-21 19:21:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

- handled the last remaining set_int_bvel* calls in nnexts.cpp.

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-25 16:35:21 +02:00
parent 88feac4272
commit d1d68f1570
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/games/blood/src/nnexts.cpp
View file

@ -6790,12 +6790,12 @@ void useSlopeChanger(DBloodActor* sourceactor, int objType, sectortype* pSect, D
if (iactor->hasX() && iactor->xspr.physAttr > 0) if (iactor->hasX() && iactor->xspr.physAttr > 0)
{ {
iactor->xspr.physAttr |= kPhysFalling; iactor->xspr.physAttr |= kPhysFalling;
iactor->add_int_bvel_z(1); iactor->vel.Z += FixedToFloat(1);
} }
else if ((iactor->spr.statnum == kStatThing || iactor->spr.statnum == kStatDude) && (iactor->spr.flags & kPhysGravity)) else if ((iactor->spr.statnum == kStatThing || iactor->spr.statnum == kStatDude) && (iactor->spr.flags & kPhysGravity))
{ {
iactor->spr.flags |= kPhysFalling; iactor->spr.flags |= kPhysFalling;
iactor->add_int_bvel_z(1); iactor->vel.Z += FixedToFloat(1);
} }
} }
} }
@ -8220,9 +8220,7 @@ void aiPatrolMove(DBloodActor* actor)
} }
frontSpeed = aiPatrolGetVelocity(pDudeInfo->frontSpeed, targetactor->xspr.busyTime); frontSpeed = aiPatrolGetVelocity(pDudeInfo->frontSpeed, targetactor->xspr.busyTime);
actor->vel += actor->spr.angle.ToVector() * FixedToFloat(frontSpeed);
actor->add_int_bvel_x(MulScale(frontSpeed, Cos(actor->int_ang()), 30));
actor->add_int_bvel_y(MulScale(frontSpeed, Sin(actor->int_ang()), 30));
} }
double vel = (actor->xspr.unused1 & kDudeFlagCrouch) ? kMaxPatrolCrouchVelocity : kMaxPatrolVelocity; double vel = (actor->xspr.unused1 & kDudeFlagCrouch) ? kMaxPatrolCrouchVelocity : kMaxPatrolVelocity;
@ -9287,7 +9285,7 @@ void triggerTouchSprite(DBloodActor* actor, DBloodActor* hActor)
trTriggerSprite(hActor, kCmdSpriteTouch, actor); trTriggerSprite(hActor, kCmdSpriteTouch, actor);
// enough to reset gSpriteHit values // enough to reset gSpriteHit values
actor->add_int_bvel_x(5); actor->vel.X += FixedToFloat(5);
} }
} }
@ -9299,7 +9297,7 @@ void triggerTouchWall(DBloodActor* actor, walltype* pHWall)
trTriggerWall(pHWall, kCmdWallTouch, actor); trTriggerWall(pHWall, kCmdWallTouch, actor);
// enough to reset gSpriteHit values // enough to reset gSpriteHit values
actor->add_int_bvel_x(5); actor->vel.X += FixedToFloat(5);
} }
} }