From 2027c6ebaf5eb7f72a494172d2c6080206466494 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Tue, 23 Nov 2021 00:55:46 +0100
Subject: [PATCH] - the last sector[]

---
 source/games/exhumed/src/player.cpp   |  8 ++++----
 source/games/exhumed/src/queen.cpp    | 12 ++++++------
 source/games/exhumed/src/sequence.cpp |  4 ++--
 source/games/exhumed/src/set.cpp      |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/source/games/exhumed/src/player.cpp b/source/games/exhumed/src/player.cpp
index c93ec8707..6ae842536 100644
--- a/source/games/exhumed/src/player.cpp
+++ b/source/games/exhumed/src/player.cpp
@@ -853,7 +853,7 @@ void AIPlayer::Tick(RunListEvent* ev)
     }
 
     // loc_1A4E6
-    int nSector =pPlayerSprite->sectnum;
+    auto pSector = pPlayerSprite->sector();
     int nSectFlag = PlayerList[nPlayer].pPlayerViewSect->Flag;
 
     int playerX = pPlayerSprite->x;
@@ -2234,11 +2234,11 @@ sectdone:
             }
         }
 
-        if (nSector != pPlayerSprite->sectnum)
+        if (pSector != pPlayerSprite->sector())
         {
-            if (sector[nSector].lotag > 0)
+            if (pSector->lotag > 0)
             {
-                runlist_SignalRun(sector[nSector].lotag - 1, nPlayer, &ExhumedAI::EnterSector);
+                runlist_SignalRun(pSector->lotag - 1, nPlayer, &ExhumedAI::EnterSector);
             }
 
             if (pPlayerSprite->sector()->lotag > 0)
diff --git a/source/games/exhumed/src/queen.cpp b/source/games/exhumed/src/queen.cpp
index 78f8a3913..0eb39fc6a 100644
--- a/source/games/exhumed/src/queen.cpp
+++ b/source/games/exhumed/src/queen.cpp
@@ -435,11 +435,11 @@ void BuildQueenEgg(int nQueen, int nVal)
 
     int x = pSprite->x;
     int y = pSprite->y;
-    int nSector =pSprite->sectnum;
-    int nFloorZ = sector[nSector].floorz;
+    auto pSector =pSprite->sector();
+    int nFloorZ = pSector->floorz;
     int nAngle = pSprite->ang;
 
-    auto pActor2 = insertActor(nSector, 121);
+    auto pActor2 = insertActor(pSector, 121);
     auto pSprite2 = &pActor2->s();
 
     pSprite2->x = x;
@@ -696,10 +696,10 @@ void BuildQueenHead(int nQueen)
     int x = pSprite->x;
     int y = pSprite->y;
     int nAngle = pSprite->ang;
-    int nSector =pSprite->sectnum;
-    int z = sector[nSector].floorz;
+    auto pSector = pSprite->sector();
+    int z = pSector->floorz;
 
-    auto pActor2 = insertActor(nSector, 121);
+    auto pActor2 = insertActor(pSector, 121);
     auto pSprite2 = &pActor2->s();
 
     pSprite2->x = x;
diff --git a/source/games/exhumed/src/sequence.cpp b/source/games/exhumed/src/sequence.cpp
index d2cb2b244..4636b756e 100644
--- a/source/games/exhumed/src/sequence.cpp
+++ b/source/games/exhumed/src/sequence.cpp
@@ -608,8 +608,8 @@ int seq_PlotSequence(int nSprite, int16_t edx, int16_t nFrame, int16_t ecx)
     }
     else
     {
-        int nSector =pTSprite->sectnum;
-        int nFloorZ = sector[nSector].floorz;
+        auto pSector =pTSprite->sector();
+        int nFloorZ = pSector->floorz;
 
         if (nFloorZ <= PlayerList[nLocalPlayer].eyelevel + initz) {
             pTSprite->owner = -1;
diff --git a/source/games/exhumed/src/set.cpp b/source/games/exhumed/src/set.cpp
index 75aac1cbe..f5cfe090b 100644
--- a/source/games/exhumed/src/set.cpp
+++ b/source/games/exhumed/src/set.cpp
@@ -121,7 +121,7 @@ void BuildSoul(DExhumedActor* pSet)
     pSprite->y = pSetSprite->y;
 
     int nSector =pSprite->sectnum;
-    pSprite->z = (RandomSize(8) << 8) + 8192 + sector[nSector].ceilingz - GetActorHeight(pActor);
+    pSprite->z = (RandomSize(8) << 8) + 8192 + pSprite->sector()->ceilingz - GetActorHeight(pActor);
 
     //pSprite->hitag = nSet;
 	pActor->pTarget = pSet;