From be065820626e5d1f434a7aeed1b9a6ab969a93e5 Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Wed, 23 Nov 2022 18:26:24 +1100 Subject: [PATCH] - SW: Remove `PLAYER::posAdd()`. --- source/games/sw/src/game.h | 4 ---- source/games/sw/src/mclip.cpp | 2 +- source/games/sw/src/player.cpp | 2 +- source/games/sw/src/sprite.cpp | 2 +- source/games/sw/src/track.cpp | 2 +- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/source/games/sw/src/game.h b/source/games/sw/src/game.h index 6fcfd5a6f..6377015b1 100644 --- a/source/games/sw/src/game.h +++ b/source/games/sw/src/game.h @@ -1891,10 +1891,6 @@ struct PLAYER } - void posAdd(const DVector2& val) - { - actor->spr.pos += val; - } DVector3 posGet() { return actor->spr.pos.plusZ(actor->viewzoffset); diff --git a/source/games/sw/src/mclip.cpp b/source/games/sw/src/mclip.cpp index 5c70b4067..3c0b8af0a 100644 --- a/source/games/sw/src/mclip.cpp +++ b/source/games/sw/src/mclip.cpp @@ -207,7 +207,7 @@ int RectClipMove(PLAYER* pp, DVector2* qpos) //Given the 4 points: x[4], y[4] if (testquadinsect(&point_num, xy, pp->cursector)) { - pp->posAdd(pvect); + pp->actor->spr.pos.XY() += pvect; return true; } diff --git a/source/games/sw/src/player.cpp b/source/games/sw/src/player.cpp index e57a5e1cc..cb3a092de 100644 --- a/source/games/sw/src/player.cpp +++ b/source/games/sw/src/player.cpp @@ -2136,7 +2136,7 @@ void DoPlayerMove(PLAYER* pp) { actor->backupvec2(); } - pp->posAdd(pp->vect); + actor->spr.pos.XY() += pp->vect; updatesector(pp->posGet(), §); if (sect != nullptr) pp->cursector = sect; diff --git a/source/games/sw/src/sprite.cpp b/source/games/sw/src/sprite.cpp index 770baa1a1..df48a56da 100644 --- a/source/games/sw/src/sprite.cpp +++ b/source/games/sw/src/sprite.cpp @@ -1543,7 +1543,7 @@ void PreMapCombineFloors(void) { if (itsect == dasect) { - pp->posAdd(dv); + pp->actor->spr.pos.XY() += dv; pp->posoldXY() = pp->actor->spr.pos.XY(); pp->actor->backupvec2(); break; diff --git a/source/games/sw/src/track.cpp b/source/games/sw/src/track.cpp index 6afd939a2..81ff15332 100644 --- a/source/games/sw/src/track.cpp +++ b/source/games/sw/src/track.cpp @@ -1487,7 +1487,7 @@ void MovePlayer(PLAYER* pp, SECTOR_OBJECT* sop, const DVector2& move) pp->RevolveDeltaAng = nullAngle; } - pp->posAdd(move); + pp->actor->spr.pos.XY() += move; if ((sop->flags & SOBJ_DONT_ROTATE)) {