From 9d5acf8350a323c7909ee0e507af000eda8e511d Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sat, 20 Aug 2022 16:20:26 +0200
Subject: [PATCH] - getangle calls

---
 source/games/exhumed/src/anubis.cpp   | 2 +-
 source/games/exhumed/src/lavadude.cpp | 2 +-
 source/games/exhumed/src/lion.cpp     | 4 ++--
 source/games/exhumed/src/mummy.cpp    | 2 +-
 source/games/exhumed/src/scorp.cpp    | 2 +-
 source/games/exhumed/src/set.cpp      | 2 +-
 source/games/exhumed/src/spider.cpp   | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/source/games/exhumed/src/anubis.cpp b/source/games/exhumed/src/anubis.cpp
index 040fb6ff0..e66d0017e 100644
--- a/source/games/exhumed/src/anubis.cpp
+++ b/source/games/exhumed/src/anubis.cpp
@@ -180,7 +180,7 @@ void AIAnubis::Tick(RunListEvent* ev)
         {
             if (move.actor() == pTarget)
             {
-                int nAng = getangle(pTarget->int_pos().X - ap->int_pos().X, pTarget->int_pos().Y - ap->int_pos().Y);
+                int nAng = getangle(pTarget->spr.pos - ap->spr.pos);
                 int nAngDiff = AngleDiff(ap->int_ang(), nAng);
 
                 if (nAngDiff < 64)
diff --git a/source/games/exhumed/src/lavadude.cpp b/source/games/exhumed/src/lavadude.cpp
index ff3137534..752927cd9 100644
--- a/source/games/exhumed/src/lavadude.cpp
+++ b/source/games/exhumed/src/lavadude.cpp
@@ -310,7 +310,7 @@ void AILavaDude::Tick(RunListEvent* ev)
         {
             if (coll.actor() == pTarget)
             {
-                int nAng = getangle(pTarget->int_pos().X - pActor->int_pos().X, pTarget->int_pos().Y - pActor->int_pos().Y);
+                int nAng = getangle(pTarget->spr.pos - pActor->spr.pos);
                 if (AngleDiff(pActor->int_ang(), nAng) < 64)
                 {
                     pActor->nAction = 2;
diff --git a/source/games/exhumed/src/lion.cpp b/source/games/exhumed/src/lion.cpp
index 6f12d21b2..57ec01a35 100644
--- a/source/games/exhumed/src/lion.cpp
+++ b/source/games/exhumed/src/lion.cpp
@@ -309,7 +309,7 @@ void AILion::Tick(RunListEvent* ev)
                 }
                 else
                 {
-                    int nAng = getangle(pTarget->int_pos().X - pActor->int_pos().X, pTarget->int_pos().Y - pActor->int_pos().Y);
+                    int nAng = getangle(pTarget->spr.pos - pActor->spr.pos);
 
                     if (AngleDiff(pActor->int_ang(), nAng) < 64)
                     {
@@ -442,7 +442,7 @@ void AILion::Tick(RunListEvent* ev)
         {
             if (nMov.actor() == pTarget)
             {
-                int nAng = getangle(pTarget->int_pos().X - pActor->int_pos().X, pTarget->int_pos().Y - pActor->int_pos().Y);
+                int nAng = getangle(pTarget->spr.pos - pActor->spr.pos);
                 if (AngleDiff(pActor->int_ang(), nAng) < 64)
                 {
                     pActor->nAction = 3;
diff --git a/source/games/exhumed/src/mummy.cpp b/source/games/exhumed/src/mummy.cpp
index e257ba533..44bfc6b9f 100644
--- a/source/games/exhumed/src/mummy.cpp
+++ b/source/games/exhumed/src/mummy.cpp
@@ -270,7 +270,7 @@ void AIMummy::Tick(RunListEvent* ev)
         {
             if (nMov.actor() == pTarget)
             {
-                int nAngle = getangle(pTarget->int_pos().X - pActor->int_pos().X, pTarget->int_pos().Y - pActor->int_pos().Y);
+                int nAngle = getangle(pTarget->spr.pos - pActor->spr.pos);
                 if (AngleDiff(pActor->int_ang(), nAngle) < 64)
                 {
                     pActor->nAction = 2;
diff --git a/source/games/exhumed/src/scorp.cpp b/source/games/exhumed/src/scorp.cpp
index 31f6a048c..56159cf2a 100644
--- a/source/games/exhumed/src/scorp.cpp
+++ b/source/games/exhumed/src/scorp.cpp
@@ -245,7 +245,7 @@ void AIScorp::Tick(RunListEvent* ev)
             {
                 if (pTarget == nMov.actor())
                 {
-                    int nAngle = getangle(pTarget->int_pos().X - pActor->int_pos().X, pTarget->int_pos().Y - pActor->int_pos().Y);
+                    int nAngle = getangle(pTarget->spr.pos - pActor->spr.pos);
                     if (AngleDiff(pActor->int_ang(), nAngle) < 64)
                     {
                         pActor->nAction = 2;
diff --git a/source/games/exhumed/src/set.cpp b/source/games/exhumed/src/set.cpp
index 4cf2fc803..15cbea57c 100644
--- a/source/games/exhumed/src/set.cpp
+++ b/source/games/exhumed/src/set.cpp
@@ -427,7 +427,7 @@ void AISet::Tick(RunListEvent* ev)
             {
                 if (pTarget == nMov.actor())
                 {
-                    int nAng = getangle(pTarget->int_pos().X - pActor->int_pos().X, pTarget->int_pos().Y - pActor->int_pos().Y);
+                    int nAng = getangle(pTarget->spr.pos - pActor->spr.pos);
                     if (AngleDiff(pActor->int_ang(), nAng) < 64)
                     {
                         pActor->nAction = 4;
diff --git a/source/games/exhumed/src/spider.cpp b/source/games/exhumed/src/spider.cpp
index 9b5a623d5..b085d3117 100644
--- a/source/games/exhumed/src/spider.cpp
+++ b/source/games/exhumed/src/spider.cpp
@@ -308,7 +308,7 @@ void AISpider::Tick(RunListEvent* ev)
         {
             if (nMov.actor() == pTarget)
             {
-                int nAng = getangle(pTarget->int_pos().X - spp->int_pos().X, pTarget->int_pos().Y - spp->int_pos().Y);
+                int nAng = getangle(pTarget->spr.pos - spp->spr.pos);
                 if (AngleDiff(spp->int_ang(), nAng) < 64)
                 {
                     spp->nAction = 2;