From 0ee3b5af1c177baad0629d2634285d353fe674fa Mon Sep 17 00:00:00 2001 From: Mitch Richters Date: Sat, 30 Oct 2021 22:00:18 +1100 Subject: [PATCH] - Blood: Replace use of `pushmove_old()` inline wrapper with `pushmove()`. --- source/games/blood/src/actor.cpp | 2 +- source/games/blood/src/nnexts.cpp | 2 +- source/games/blood/src/player.cpp | 2 +- source/games/blood/src/prediction.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/games/blood/src/actor.cpp b/source/games/blood/src/actor.cpp index 32d4f26e8..66ba043ee 100644 --- a/source/games/blood/src/actor.cpp +++ b/source/games/blood/src/actor.cpp @@ -4879,7 +4879,7 @@ void MoveDude(DBloodActor* actor) if (sector[nSector].type >= kSectorPath && sector[nSector].type <= kSectorRotate) { short nSector2 = nSector; - if (pushmove_old(&pSprite->x, &pSprite->y, &pSprite->z, &nSector2, wd, tz, bz, CLIPMASK0) == -1) + if (pushmove(&pSprite->pos, &nSector2, wd, tz, bz, CLIPMASK0) == -1) actDamageSprite(actor, actor, kDamageFall, 1000 << 4); if (nSector2 != -1) nSector = nSector2; diff --git a/source/games/blood/src/nnexts.cpp b/source/games/blood/src/nnexts.cpp index 2c4fd7ecc..c046f1f0f 100644 --- a/source/games/blood/src/nnexts.cpp +++ b/source/games/blood/src/nnexts.cpp @@ -1603,7 +1603,7 @@ void debrisMove(int listIndex) if (sector[nSector].type >= kSectorPath && sector[nSector].type <= kSectorRotate) { short nSector2 = nSector; - if (pushmove_old(&pSprite->x, &pSprite->y, &pSprite->z, &nSector2, clipDist, ceilDist, floorDist, CLIPMASK0) != -1) + if (pushmove(&pSprite->pos, &nSector2, clipDist, ceilDist, floorDist, CLIPMASK0) != -1) nSector = nSector2; } diff --git a/source/games/blood/src/player.cpp b/source/games/blood/src/player.cpp index 0edb62026..b34c77281 100644 --- a/source/games/blood/src/player.cpp +++ b/source/games/blood/src/player.cpp @@ -1668,7 +1668,7 @@ void playerProcess(PLAYER *pPlayer) if (!gNoClip) { short nSector = pSprite->sectnum; - if (pushmove_old(&pSprite->x, &pSprite->y, &pSprite->z, &nSector, dw, dzt, dzb, CLIPMASK0) == -1) + if (pushmove(&pSprite->pos, &nSector, dw, dzt, dzb, CLIPMASK0) == -1) actDamageSprite(actor, actor, kDamageFall, 500<<4); if (pSprite->sectnum != nSector) { diff --git a/source/games/blood/src/prediction.cpp b/source/games/blood/src/prediction.cpp index 6fe4ce1fa..44ced83a6 100644 --- a/source/games/blood/src/prediction.cpp +++ b/source/games/blood/src/prediction.cpp @@ -279,7 +279,7 @@ void fakePlayerProcess(PLAYER *pPlayer, InputPacket *pInput) short nSector = predict.sectnum; if (!gNoClip) { - pushmove_old((int32_t*)&predict.x, (int32_t*)&predict.y, (int32_t*)&predict.z, &predict.sectnum, dw, dzt, dzb, CLIPMASK0); + pushmove(&predict.pos, &predict.sectnum, dw, dzt, dzb, CLIPMASK0); if (predict.sectnum == -1) predict.sectnum = nSector; } @@ -390,7 +390,7 @@ static void fakeMoveDude(spritetype *pSprite) if (sector[nSector].type >= kSectorPath && sector[nSector].type <= kSectorRotate) { short nSector2 = nSector; - pushmove_old((int32_t*)&predict.x, (int32_t*)&predict.y, (int32_t*)&predict.z, &nSector2, wd, tz, bz, CLIPMASK0); + pushmove(&predict.pos, &nSector2, wd, tz, bz, CLIPMASK0); if (nSector2 != -1) nSector = nSector2; }