From 782fb08209712d7fb16a962adf92542e73d8293e Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Sat, 27 Aug 2022 22:00:58 +1000 Subject: [PATCH] - SW: Make better use of some TAngle backend utilities. --- source/games/sw/src/draw.cpp | 2 +- source/games/sw/src/player.cpp | 2 +- source/games/sw/src/track.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/games/sw/src/draw.cpp b/source/games/sw/src/draw.cpp index d4da336fa..1b1302784 100644 --- a/source/games/sw/src/draw.cpp +++ b/source/games/sw/src/draw.cpp @@ -1101,7 +1101,7 @@ void CameraView(PLAYER* pp, int *tx, int *ty, int *tz, sectortype** tsect, DAngl while (auto actor = it.Next()) { ang = VecToAngle(*tx - actor->int_pos().X, *ty - actor->int_pos().Y); - ang_test = (DAngle::fromBuild(actor->int_ang()) - ang).Normalized180() < DAngle::fromBuild(actor->spr.lotag); + ang_test = deltaangle(ang, DAngle::fromBuild(actor->int_ang())) < DAngle::fromBuild(actor->spr.lotag); FAFcansee_test = (FAFcansee(actor->int_pos().X, actor->int_pos().Y, actor->int_pos().Z, actor->sector(), *tx, *ty, *tz, pp->cursector) || diff --git a/source/games/sw/src/player.cpp b/source/games/sw/src/player.cpp index ca670820d..8d84807cb 100644 --- a/source/games/sw/src/player.cpp +++ b/source/games/sw/src/player.cpp @@ -1551,7 +1551,7 @@ void DoPlayerTurnTurret(PLAYER* pp, float avel) if (sop->limit_ang_center >= nullAngle) { - diff = (new_ang - sop->limit_ang_center).Normalized180(); + diff = deltaangle(sop->limit_ang_center, new_ang); if (abs(diff) >= sop->limit_ang_delta) { diff --git a/source/games/sw/src/track.cpp b/source/games/sw/src/track.cpp index a66c547f4..d2c3929b8 100644 --- a/source/games/sw/src/track.cpp +++ b/source/games/sw/src/track.cpp @@ -2801,7 +2801,7 @@ void DoAutoTurretObject(SECTOR_OBJECT* sop) if (sop->limit_ang_center >= nullAngle) { - diff = (DAngle::fromBuild(sop->ang) - sop->limit_ang_center).Normalized180(); + diff = deltaangle(sop->limit_ang_center, DAngle::fromBuild(sop->ang)); if (abs(diff) >= sop->limit_ang_delta) {