zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-18 22:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Blood: Replace use of pushmove_old() inline wrapper with pushmove().

Browse source
This commit is contained in:
Mitch Richters 2021-10-30 22:00:18 +11:00 committed by Christoph Oelckers
parent adcdbdc931
commit 0ee3b5af1c
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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;

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

@ -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;
}

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

@ -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)
{

4
source/games/blood/src/prediction.cpp
View file

@ -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;
}