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

- Blood: Floatified remaining bits of playerProcess().

Browse source
This commit is contained in:
Mitchell Richters 2022-09-25 22:47:15 +10:00 committed by Christoph Oelckers
parent 32c784cd0f
commit cea0e74299
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
source/games/blood/src/player.cpp
View file

@ -1789,15 +1789,15 @@ void playerProcess(PLAYER* pPlayer)
DBloodActor* actor = pPlayer->actor; DBloodActor* actor = pPlayer->actor;
POSTURE* pPosture = &pPlayer->pPosture[pPlayer->lifeMode][pPlayer->posture]; POSTURE* pPosture = &pPlayer->pPosture[pPlayer->lifeMode][pPlayer->posture];
powerupProcess(pPlayer); powerupProcess(pPlayer);
int top, bottom; double top, bottom;
GetActorExtents(actor, &top, &bottom); GetActorExtents(actor, &top, &bottom);
int dzb = (bottom - actor->int_pos().Z) / 4; double dzflor = (bottom - actor->spr.pos.Z) / 4;
int dzt = (actor->int_pos().Z - top) / 4; double dzceil = (actor->spr.pos.Z - top) / 4;
int dw = actor->int_clipdist(); int dw = actor->int_clipdist();
if (!gNoClip) if (!gNoClip)
{ {
auto pSector = actor->sector(); auto pSector = actor->sector();
if (pushmove(actor, &pSector, dw, dzt, dzb, CLIPMASK0) == -1) if (pushmove(actor->spr.pos, &pSector, dw, dzceil, dzflor, CLIPMASK0) == -1)
actDamageSprite(actor, actor, kDamageFall, 500 << 4); actDamageSprite(actor, actor, kDamageFall, 500 << 4);
if (actor->sector() != pSector) if (actor->sector() != pSector)
{ {
@ -1811,7 +1811,6 @@ void playerProcess(PLAYER* pPlayer)
} }
} }
ProcessInput(pPlayer); ProcessInput(pPlayer);
int nSpeed = approxDist(actor->int_vel().X, actor->int_vel().Y);
pPlayer->zViewVel = interpolatedvalue(pPlayer->zViewVel, actor->vel.Z, FixedToFloat(0x7000)); pPlayer->zViewVel = interpolatedvalue(pPlayer->zViewVel, actor->vel.Z, FixedToFloat(0x7000));
double dz = pPlayer->actor->spr.pos.Z - pPosture->eyeAboveZ - pPlayer->zView; double dz = pPlayer->actor->spr.pos.Z - pPosture->eyeAboveZ - pPlayer->zView;
if (dz > 0) if (dz > 0)
@ -1827,7 +1826,7 @@ void playerProcess(PLAYER* pPlayer)
pPlayer->zWeaponVel += dz * FixedToFloat(0xc00); pPlayer->zWeaponVel += dz * FixedToFloat(0xc00);
pPlayer->zWeapon += pPlayer->zWeaponVel; pPlayer->zWeapon += pPlayer->zWeaponVel;
pPlayer->bobPhase = ClipLow(pPlayer->bobPhase - 4, 0); pPlayer->bobPhase = ClipLow(pPlayer->bobPhase - 4, 0);
nSpeed >>= FRACBITS; int nSpeed = int(actor->vel.XY().Length());
if (pPlayer->posture == 1) if (pPlayer->posture == 1)
{ {
pPlayer->bobAmp = (pPlayer->bobAmp + 17) & 2047; pPlayer->bobAmp = (pPlayer->bobAmp + 17) & 2047;