From 559c24fa920ce495edcbaed9a82c1aa8b8177757 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 30 Aug 2022 21:36:09 +0200 Subject: [PATCH] - 3 simple set_int_pos replacements --- source/games/duke/src/actors_d.cpp | 7 ++----- source/games/exhumed/src/move.cpp | 9 ++------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/source/games/duke/src/actors_d.cpp b/source/games/duke/src/actors_d.cpp index 49f226630..a2bc79517 100644 --- a/source/games/duke/src/actors_d.cpp +++ b/source/games/duke/src/actors_d.cpp @@ -2297,11 +2297,8 @@ static void greenslime(DDukeActor *actor) if (s5) { s5->spr.xvel = 0; - - int l = s5->int_ang(); - - actor->set_int_pos({ s5->int_pos().X + bcos(l, -11), s5->int_pos().Y + bsin(l, -11), s5->int_pos().Z }); - + + actor->spr.pos = s5->spr.pos + s5->spr.angle.ToVector() * 0.5; actor->spr.picnum = GREENSLIME + 2 + (global_random & 1); if (actor->spr.yrepeat < 64) actor->spr.yrepeat += 2; diff --git a/source/games/exhumed/src/move.cpp b/source/games/exhumed/src/move.cpp index 140c39f33..eecffd523 100644 --- a/source/games/exhumed/src/move.cpp +++ b/source/games/exhumed/src/move.cpp @@ -535,9 +535,7 @@ Collision movesprite(DExhumedActor* pActor, int dx, int dy, int dz, int ceildist } Collision coll; - auto pos = pActor->int_pos(); - clipmove(pos, &pSector, dx, dy, nClipDist, nSpriteHeight, flordist, clipmask, coll); - pActor->set_int_pos(pos); + clipmove(pActor->spr.pos, &pSector, dx, dy, nClipDist, nSpriteHeight, flordist, clipmask, coll); if (coll.type != kHitNone) // originally this or'ed the two values which can create unpredictable bad values in some edge cases. { coll.exbits = nRet.exbits; @@ -1028,10 +1026,7 @@ void MoveSector(sectortype* pSector, int nAngle, int *nXVel, int *nYVel) if (pActor->spr.statnum >= 99 && nZVal == pActor->int_pos().Z && !(pActor->spr.cstat & CSTAT_SPRITE_INVISIBLE)) { pSectorB = pSector; - auto lpos = pActor->int_pos(); - clipmove(lpos, &pSectorB, xvect, yvect, 4 * pActor->spr.clipdist, 5120, -5120, CLIPMASK0, scratch); - pActor->set_int_pos(lpos); - + clipmove(pActor->spr.pos, &pSectorB, xvect, yvect, 4 * pActor->spr.clipdist, 5120, -5120, CLIPMASK0, scratch); } } }