From 66a08a26e813f4ace8dcb0c187447aabbd730af5 Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Sun, 20 Nov 2022 20:00:26 +1100 Subject: [PATCH] - Duke: Remove `player_struct::posoldX()`, `player_struct::posoldY()`, and `player_struct::posoldXY()`. --- source/games/duke/src/actors.cpp | 4 ++-- source/games/duke/src/actors_d.cpp | 4 ++-- source/games/duke/src/actors_r.cpp | 6 +++--- source/games/duke/src/game_misc.cpp | 2 +- source/games/duke/src/gameexec.cpp | 8 ++++---- source/games/duke/src/player_d.cpp | 4 ++-- source/games/duke/src/player_r.cpp | 2 +- source/games/duke/src/types.h | 13 ------------- 8 files changed, 15 insertions(+), 28 deletions(-) diff --git a/source/games/duke/src/actors.cpp b/source/games/duke/src/actors.cpp index 77ff79d0b..b54778dc8 100644 --- a/source/games/duke/src/actors.cpp +++ b/source/games/duke/src/actors.cpp @@ -4392,8 +4392,8 @@ void movefta(void) if (badguy(act)) { auto xyrand = []() -> double { return (64 - (krand() & 127)) * maptoworld; }; - double px = ps[p].posoldX() - xyrand(); - double py = ps[p].posoldY() - xyrand(); + double px = ps[p].GetActor()->opos.X - xyrand(); + double py = ps[p].GetActor()->opos.Y - xyrand(); updatesector(DVector3(px, py, 0), &psect); if (psect == nullptr) { diff --git a/source/games/duke/src/actors_d.cpp b/source/games/duke/src/actors_d.cpp index b88115103..e5adb2336 100644 --- a/source/games/duke/src/actors_d.cpp +++ b/source/games/duke/src/actors_d.cpp @@ -3032,7 +3032,7 @@ void move_d(DDukeActor *actor, int playernum, int xvel) if (a & face_player) { if (ps[playernum].newOwner != nullptr) - goalang = (ps[playernum].posoldXY() - actor->spr.pos.XY()).Angle(); + goalang = (ps[playernum].GetActor()->opos.XY() - actor->spr.pos.XY()).Angle(); else goalang = (ps[playernum].GetActor()->spr.pos.XY() - actor->spr.pos.XY()).Angle(); angdif = deltaangle(actor->spr.angle, goalang) * 0.25; if (angdif > -DAngle22_5 / 16 && angdif < nullAngle) angdif = nullAngle; @@ -3045,7 +3045,7 @@ void move_d(DDukeActor *actor, int playernum, int xvel) if (a & face_player_slow) { if (ps[playernum].newOwner != nullptr) - goalang = (ps[playernum].posoldXY() - actor->spr.pos.XY()).Angle(); + goalang = (ps[playernum].GetActor()->opos.XY() - actor->spr.pos.XY()).Angle(); else goalang = (ps[playernum].GetActor()->spr.pos.XY() - actor->spr.pos.XY()).Angle(); angdif = DAngle22_5 * 0.25 * Sgn(deltaangle(actor->spr.angle, goalang).Degrees()); // this looks very wrong... actor->spr.angle += angdif; diff --git a/source/games/duke/src/actors_r.cpp b/source/games/duke/src/actors_r.cpp index 26c9b6592..e8d57a85f 100644 --- a/source/games/duke/src/actors_r.cpp +++ b/source/games/duke/src/actors_r.cpp @@ -3209,7 +3209,7 @@ void move_r(DDukeActor *actor, int pnum, int xvel) if (a & face_player) { if (ps[pnum].newOwner != nullptr) - goalang = (ps[pnum].posoldXY() - actor->spr.pos.XY()).Angle(); + goalang = (ps[pnum].GetActor()->opos.XY() - actor->spr.pos.XY()).Angle(); else goalang = (ps[pnum].GetActor()->spr.pos.XY() - actor->spr.pos.XY()).Angle(); angdif = deltaangle(actor->spr.angle, goalang) * 0.25; if (angdif > -DAngle22_5 / 16 && angdif < nullAngle) angdif = nullAngle; @@ -3222,7 +3222,7 @@ void move_r(DDukeActor *actor, int pnum, int xvel) if (a & face_player_slow) { if (ps[pnum].newOwner != nullptr) - goalang = (ps[pnum].posoldXY() - actor->spr.pos.XY()).Angle(); + goalang = (ps[pnum].GetActor()->opos.XY() - actor->spr.pos.XY()).Angle(); else goalang = (ps[pnum].GetActor()->spr.pos.XY() - actor->spr.pos.XY()).Angle(); angdif = DAngle22_5 * 0.25 * Sgn(deltaangle(actor->spr.angle, goalang).Degrees()); // this looks very wrong... actor->spr.angle += angdif; @@ -3233,7 +3233,7 @@ void move_r(DDukeActor *actor, int pnum, int xvel) if (a & antifaceplayerslow) { if (ps[pnum].newOwner != nullptr) - goalang = ((ps[pnum].posoldXY() - actor->spr.pos.XY()).Angle() + DAngle180); + goalang = ((ps[pnum].GetActor()->opos.XY() - actor->spr.pos.XY()).Angle() + DAngle180); else goalang = ((ps[pnum].GetActor()->spr.pos.XY() - actor->spr.pos.XY()).Angle() + DAngle180); angdif = DAngle22_5 * 0.25 * Sgn(deltaangle(actor->spr.angle, goalang).Degrees()); // this looks very wrong... actor->spr.angle += angdif; diff --git a/source/games/duke/src/game_misc.cpp b/source/games/duke/src/game_misc.cpp index 3c20eace2..6dc0f3a18 100644 --- a/source/games/duke/src/game_misc.cpp +++ b/source/games/duke/src/game_misc.cpp @@ -279,7 +279,7 @@ void drawoverlays(double interpfrac) } else { - cposxy = pp->posoldXY(); + cposxy = pp->GetActor()->opos.XY(); cang = pp->angle.oang; } DrawOverheadMap(cposxy, cang, interpfrac); diff --git a/source/games/duke/src/gameexec.cpp b/source/games/duke/src/gameexec.cpp index af65b6c9d..027647448 100644 --- a/source/games/duke/src/gameexec.cpp +++ b/source/games/duke/src/gameexec.cpp @@ -378,13 +378,13 @@ void DoPlayer(bool bSet, int lVar1, int lLabelID, int lVar2, DDukeActor* sActor, break; case PLAYER_OPOSX: - if (bSet) ps[iPlayer].posoldX() = lValue * maptoworld; - else SetGameVarID(lVar2, int(ps[iPlayer].posoldX() * (1/maptoworld)), sActor, sPlayer); + if (bSet) ps[iPlayer].GetActor()->opos.X = lValue * maptoworld; + else SetGameVarID(lVar2, int(ps[iPlayer].GetActor()->opos.X * (1/maptoworld)), sActor, sPlayer); break; case PLAYER_OPOSY: - if (bSet) ps[iPlayer].posoldY() = lValue * maptoworld; - else SetGameVarID(lVar2, int(ps[iPlayer].posoldY() * (1 / maptoworld)), sActor, sPlayer); + if (bSet) ps[iPlayer].GetActor()->opos.Y = lValue * maptoworld; + else SetGameVarID(lVar2, int(ps[iPlayer].GetActor()->opos.Y * (1 / maptoworld)), sActor, sPlayer); break; case PLAYER_OPOSZ: diff --git a/source/games/duke/src/player_d.cpp b/source/games/duke/src/player_d.cpp index 805b06135..db3e7db9d 100644 --- a/source/games/duke/src/player_d.cpp +++ b/source/games/duke/src/player_d.cpp @@ -153,7 +153,7 @@ static void shootflamethrowerflame(DDukeActor* actor, int p, DVector3 spos, DAng { double x; int j = findplayer(actor, &x); - sang = (ps[j].posoldXY() - spos.XY()).Angle(); + sang = (ps[j].GetActor()->opos.XY() - spos.XY()).Angle(); if (actor->spr.picnum == BOSS5) { @@ -693,7 +693,7 @@ static void shootrpg(DDukeActor *actor, int p, DVector3 pos, DAngle ang, int atw { double x; int j = findplayer(actor, &x); - ang = (ps[j].posoldXY() - pos.XY()).Angle(); + ang = (ps[j].GetActor()->opos.XY() - pos.XY()).Angle(); if (actor->spr.picnum == BOSS3) { double zoffs = 32; diff --git a/source/games/duke/src/player_r.cpp b/source/games/duke/src/player_r.cpp index 6e76b77a0..9f71ff196 100644 --- a/source/games/duke/src/player_r.cpp +++ b/source/games/duke/src/player_r.cpp @@ -613,7 +613,7 @@ static void shootrpg(DDukeActor* actor, int p, DVector3 pos, DAngle ang, int atw { double x; int j = findplayer(actor, &x); - ang = (ps[j].posoldXY() - pos.XY()).Angle(); + ang = (ps[j].GetActor()->opos.XY() - pos.XY()).Angle(); if (actor->spr.picnum == BOSS3) pos.Z -= 32; else if (actor->spr.picnum == BOSS2) diff --git a/source/games/duke/src/types.h b/source/games/duke/src/types.h index 32bd693a0..9d6c9c473 100644 --- a/source/games/duke/src/types.h +++ b/source/games/duke/src/types.h @@ -336,19 +336,6 @@ struct player_struct } - double& posoldX() - { - return GetActor()->opos.X; - } - double& posoldY() - { - return GetActor()->opos.Y; - } - DVector2& posoldXY() - { - return GetActor()->opos.XY(); - } - void posoldZset(const double val) { GetActor()->opos.Z = val - GetActor()->viewzoffset;