From ba8bdf347e703cac27d899992688f0bf69988073 Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Sun, 16 Apr 2023 18:07:10 +1000
Subject: [PATCH] - Exhumed: Repair OOB seq access with Anubis.

* Everytime `nAction` changes, `nFrame` must be reset as well.
* One `AnubisSeq[]` index has an `nSeqId` of `-1`, this must be handled.
---
 source/games/exhumed/src/anubis.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/source/games/exhumed/src/anubis.cpp b/source/games/exhumed/src/anubis.cpp
index d9cd1f56a..944e421cc 100644
--- a/source/games/exhumed/src/anubis.cpp
+++ b/source/games/exhumed/src/anubis.cpp
@@ -226,6 +226,7 @@ void AIAnubis::Tick(RunListEvent* ev)
                 {
                     // Don't let Anubis get stuck in this state and allow him to acquire a new target.
                     ap->nAction = 0;
+                    ap->nFrame = 0;
                     ap->nCount = 50;
                 }
             }
@@ -239,6 +240,7 @@ void AIAnubis::Tick(RunListEvent* ev)
         if (pTarget == nullptr)
         {
             ap->nAction = 0;
+            ap->nFrame = 0;
             ap->nCount = 50;
         }
         else
@@ -246,6 +248,7 @@ void AIAnubis::Tick(RunListEvent* ev)
             if (PlotCourseToSprite(ap, pTarget) >= 48)
             {
                 ap->nAction = 1;
+                ap->nFrame = 0;
             }
             else if (seqFrame.flags & 0x80)
             {
@@ -342,7 +345,11 @@ void AIAnubis::Draw(RunListEvent* ev)
     if (const auto ap = ev->pObjActor)
     {
         const auto anubisSeq = &AnubisSeq[ap->nAction];
-        seq_PlotSequence(ev->nParam, ap->nSeqFile, anubisSeq->nSeqId, ap->nFrame, anubisSeq->nFlags);
+
+        if (anubisSeq->nSeqId >= 0)
+        {
+            seq_PlotSequence(ev->nParam, ap->nSeqFile, anubisSeq->nSeqId, ap->nFrame, anubisSeq->nFlags);
+        }
     }
 }