From dbc46e2a7558651ba65495254d461106b905c261 Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Sat, 27 Aug 2022 22:20:38 +1000 Subject: [PATCH] - Change out `PlayerAngle::settarget()`'s input from `binangle` to `DAngle`. --- source/core/gameinput.h | 18 +++++++++--------- source/games/blood/src/nnexts.cpp | 6 +++--- source/games/blood/src/triggers.cpp | 2 +- source/games/duke/src/actors.cpp | 2 +- source/games/duke/src/gameexec.cpp | 2 +- source/games/exhumed/src/player.cpp | 2 +- source/games/sw/src/player.cpp | 6 +++--- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/source/core/gameinput.h b/source/core/gameinput.h index cfefeba20..9633fa60d 100644 --- a/source/core/gameinput.h +++ b/source/core/gameinput.h @@ -156,7 +156,7 @@ struct PlayerAngle // Ticrate playsim adjustment helpers. void resetadjustment() { adjustment = 0; } - bool targetset() { return target.asbam(); } + bool targetset() { return target.BAMs(); } // Input locking helpers. void lockinput() { inputdisabled = true; } @@ -180,15 +180,15 @@ struct PlayerAngle } } - void settarget(binangle const value, bool const backup = false) + void settarget(const DAngle value, bool const backup = false) { if (!SyncInput() && !backup) { - target = value.asbam() ? value : bamang(1); + target = value.BAMs() ? value : DAngle::fromBam(1); } else { - ang = value; + ang = bamang(value.BAMs()); if (backup) oang = ang; } } @@ -197,16 +197,16 @@ struct PlayerAngle { if (targetset()) { - auto delta = getincanglebam(ang, target).signedbuildf(); + auto delta = deltaangle(DAngle::fromBam(ang.asbam()), target).Degrees(); if (abs(delta) > 1) { - ang += buildfang(scaleAdjust * delta); + ang += degang(scaleAdjust * delta); } else { - ang = target; - target = bamang(0); + ang = bamang(target.BAMs()); + target = DAngle::fromBam(0); } } else if (adjustment) @@ -216,7 +216,7 @@ struct PlayerAngle } private: - binangle target; + DAngle target; double adjustment; bool inputdisabled; }; diff --git a/source/games/blood/src/nnexts.cpp b/source/games/blood/src/nnexts.cpp index 61fc901c8..6b5abf6bd 100644 --- a/source/games/blood/src/nnexts.cpp +++ b/source/games/blood/src/nnexts.cpp @@ -3281,7 +3281,7 @@ void useTeleportTarget(DBloodActor* sourceactor, DBloodActor* actor) { if (pPlayer) { - pPlayer->angle.settarget(buildang(sourceactor->spr.angle)); + pPlayer->angle.settarget(DAngle::fromBuild(sourceactor->int_ang())); pPlayer->angle.lockinput(); } else if (isDude) sourceactor->xspr.goalAng = actor->spr.angle = sourceactor->spr.angle; @@ -6099,12 +6099,12 @@ bool modernTypeOperateSprite(DBloodActor* actor, EVENT& event) if (actor->xspr.data4 != 0) break; else if (actor->spr.flags & kModernTypeFlag1) { - pPlayer->angle.settarget(buildang(actor->int_ang())); + pPlayer->angle.settarget(DAngle::fromBuild(actor->int_ang())); pPlayer->angle.lockinput(); } else if (valueIsBetween(actor->xspr.data2, -kAng360, kAng360)) { - pPlayer->angle.settarget(buildang(actor->xspr.data2)); + pPlayer->angle.settarget(DAngle::fromBuild(actor->xspr.data2)); pPlayer->angle.lockinput(); } break; diff --git a/source/games/blood/src/triggers.cpp b/source/games/blood/src/triggers.cpp index 84d755c78..c0adf24aa 100644 --- a/source/games/blood/src/triggers.cpp +++ b/source/games/blood/src/triggers.cpp @@ -1646,7 +1646,7 @@ void OperateTeleport(sectortype* pSector) { playerResetInertia(pPlayer); pPlayer->zViewVel = pPlayer->zWeaponVel = 0; - pPlayer->angle.settarget(buildang(actor->int_ang()), true); + pPlayer->angle.settarget(DAngle::fromBuild(actor->int_ang()), true); } } } diff --git a/source/games/duke/src/actors.cpp b/source/games/duke/src/actors.cpp index 2870719ab..d0fdc1e29 100644 --- a/source/games/duke/src/actors.cpp +++ b/source/games/duke/src/actors.cpp @@ -704,7 +704,7 @@ void movecrane(DDukeActor *actor, int crane) actor->SetActiveCrane(true); ps[p].on_crane = actor; S_PlayActorSound(isRR() ? 390 : DUKE_GRUNT, ps[p].GetActor()); - ps[p].angle.settarget(buildang(actor->int_ang() + 1024)); + ps[p].angle.settarget(DAngle::fromBuild(actor->int_ang() + 1024)); } else { diff --git a/source/games/duke/src/gameexec.cpp b/source/games/duke/src/gameexec.cpp index 3d1f8b2b7..4a23eb7f3 100644 --- a/source/games/duke/src/gameexec.cpp +++ b/source/games/duke/src/gameexec.cpp @@ -472,7 +472,7 @@ void DoPlayer(bool bSet, int lVar1, int lLabelID, int lVar2, DDukeActor* sActor, break; case PLAYER_ANG: - if (bSet) ps[iPlayer].angle.settarget(buildang(lValue)); + if (bSet) ps[iPlayer].angle.settarget(DAngle::fromBuild(lValue)); else SetGameVarID(lVar2, ps[iPlayer].angle.ang.asbuild(), sActor, sPlayer); break; diff --git a/source/games/exhumed/src/player.cpp b/source/games/exhumed/src/player.cpp index 52814e0d9..59cd3b7ad 100644 --- a/source/games/exhumed/src/player.cpp +++ b/source/games/exhumed/src/player.cpp @@ -923,7 +923,7 @@ void AIPlayer::Tick(RunListEvent* ev) if (nTotalPlayers <= 1) { auto ang = GetAngleToSprite(pPlayerActor, pSpiritSprite) & kAngleMask; - PlayerList[nPlayer].angle.settarget(buildang(ang), true); + PlayerList[nPlayer].angle.settarget(DAngle::fromBuild(ang), true); pPlayerActor->set_int_ang(ang); PlayerList[nPlayer].horizon.settarget(buildhoriz(0), true); diff --git a/source/games/sw/src/player.cpp b/source/games/sw/src/player.cpp index 6525d7e65..8097dcfc6 100644 --- a/source/games/sw/src/player.cpp +++ b/source/games/sw/src/player.cpp @@ -3349,7 +3349,7 @@ void DoPlayerClimb(PLAYER* pp) pp->LadderPosition.X = lActor->int_pos().X + nx * 5; pp->LadderPosition.Y = lActor->int_pos().Y + ny * 5; - pp->angle.settarget(buildang(lActor->int_ang() + 1024)); + pp->angle.settarget(DAngle::fromBuild(lActor->int_ang() + 1024)); } } } @@ -3731,7 +3731,7 @@ bool PlayerOnLadder(PLAYER* pp) pp->LadderPosition.X = lActor->int_pos().X + nx * 5; pp->LadderPosition.Y = lActor->int_pos().Y + ny * 5; - pp->angle.settarget(buildang(lActor->int_ang() + 1024)); + pp->angle.settarget(DAngle::fromBuild(lActor->int_ang() + 1024)); return true; } @@ -6641,7 +6641,7 @@ void domovethings(void) { int deltax = Player[myconnectindex].pos.X - Player[screenpeek].pos.X; int deltay = Player[myconnectindex].pos.Y - Player[screenpeek].pos.Y; - Player[screenpeek].angle.settarget(bvectangbam(deltax, deltay)); + Player[screenpeek].angle.settarget(VecToAngle(deltax, deltay)); } if (!(pp->Flags & PF_DEAD))