From 8f9e9de4b4774fb3ae350e2eee8dbebe41d0ccb9 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Fri, 15 Oct 2021 21:10:16 +0200
Subject: [PATCH] - converted FuncBullets into a class.

---
 source/games/exhumed/src/aistuff.h  |   6 ++
 source/games/exhumed/src/bullet.cpp | 112 +++++++++++++---------------
 2 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/source/games/exhumed/src/aistuff.h b/source/games/exhumed/src/aistuff.h
index 5a115af67..6d8411880 100644
--- a/source/games/exhumed/src/aistuff.h
+++ b/source/games/exhumed/src/aistuff.h
@@ -452,6 +452,12 @@ struct AIBubble : ExhumedAI
     void Draw(RunListEvent* ev) override;
 };
 
+class AIBullet : public ExhumedAI
+{
+    void Tick(RunListEvent* ev) override;
+    void Draw(RunListEvent* ev) override;
+};
+
 
 void runlist_DispatchEvent(ExhumedAI* ai, int nObject, int nMessage, int nDamage, int nRun);
 
diff --git a/source/games/exhumed/src/bullet.cpp b/source/games/exhumed/src/bullet.cpp
index 744cfd873..621350d9a 100644
--- a/source/games/exhumed/src/bullet.cpp
+++ b/source/games/exhumed/src/bullet.cpp
@@ -811,76 +811,70 @@ int BuildBullet(short nSprite, int nType, int, int, int val1, int nAngle, int va
     return nBulletSprite | (nBullet << 16);
 }
 
-void FuncBullet(int nObject, int nMessage, int, int nRun)
+void AIBullet::Tick(RunListEvent* ev)
 {
-    short nBullet = RunData[nRun].nVal;
+    short nBullet = RunData[ev->nRun].nVal;
     assert(nBullet >= 0 && nBullet < kMaxBullets);
 
     short nSeq = SeqOffsets[BulletList[nBullet].nSeq];
     short nSprite = BulletList[nBullet].nSprite;
-	auto pSprite = &sprite[nSprite];
+    auto pSprite = &sprite[nSprite];
 
-    switch (nMessage)
+    short nFlag = FrameFlag[SeqBase[nSeq] + BulletList[nBullet].nFrame];
+
+    seq_MoveSequence(nSprite, nSeq, BulletList[nBullet].nFrame);
+
+    if (nFlag & 0x80)
     {
-        case 0x20000:
+        BuildAnim(-1, 45, 0, pSprite->x, pSprite->y, pSprite->z, pSprite->sectnum, pSprite->xrepeat, 0);
+    }
+
+    BulletList[nBullet].nFrame++;
+    if (BulletList[nBullet].nFrame >= SeqSize[nSeq])
+    {
+        if (!BulletList[nBullet].field_12)
         {
-            short nFlag = FrameFlag[SeqBase[nSeq] + BulletList[nBullet].nFrame];
-
-            seq_MoveSequence(nSprite, nSeq, BulletList[nBullet].nFrame);
-
-            if (nFlag & 0x80)
-            {
-                BuildAnim(-1, 45, 0, pSprite->x, pSprite->y, pSprite->z, pSprite->sectnum, pSprite->xrepeat, 0);
-            }
-
-            BulletList[nBullet].nFrame++;
-            if (BulletList[nBullet].nFrame >= SeqSize[nSeq])
-            {
-                if (!BulletList[nBullet].field_12)
-                {
-                    BulletList[nBullet].nSeq = BulletInfo[BulletList[nBullet].nType].nSeq;
-                    BulletList[nBullet].field_12++;
-                }
-
-                BulletList[nBullet].nFrame = 0;
-            }
-
-            if (BulletList[nBullet].field_E != -1 && --BulletList[nBullet].field_E == 0)
-            {
-                DestroyBullet(nBullet);
-            }
-            else
-            {
-                MoveBullet(nBullet);
-            }
-            break;
+            BulletList[nBullet].nSeq = BulletInfo[BulletList[nBullet].nType].nSeq;
+            BulletList[nBullet].field_12++;
         }
 
-        case 0x90000:
-        {
-            short nSprite2 = nObject;
-            mytsprite[nSprite2].statnum = 1000;
+        BulletList[nBullet].nFrame = 0;
+    }
 
-            if (BulletList[nBullet].nType == 15)
-            {
-                seq_PlotArrowSequence(nSprite2, nSeq, BulletList[nBullet].nFrame);
-            }
-            else
-            {
-                seq_PlotSequence(nSprite2, nSeq, BulletList[nBullet].nFrame, 0);
-                mytsprite[nSprite2].owner = -1;
-            }
-            break;
-        }
-
-        case 0xA0000:
-            break;
-
-        default:
-        {
-            Printf("unknown msg %d for bullet\n", nMessage);
-            return;
-        }
+    if (BulletList[nBullet].field_E != -1 && --BulletList[nBullet].field_E == 0)
+    {
+        DestroyBullet(nBullet);
+    }
+    else
+    {
+        MoveBullet(nBullet);
     }
 }
+
+void AIBullet::Draw(RunListEvent* ev)
+{
+    short nBullet = RunData[ev->nRun].nVal;
+    assert(nBullet >= 0 && nBullet < kMaxBullets);
+
+    short nSeq = SeqOffsets[BulletList[nBullet].nSeq];
+
+    short nSprite2 = ev->nIndex;
+    mytsprite[nSprite2].statnum = 1000;
+
+    if (BulletList[nBullet].nType == 15)
+    {
+        seq_PlotArrowSequence(nSprite2, nSeq, BulletList[nBullet].nFrame);
+    }
+    else
+    {
+        seq_PlotSequence(nSprite2, nSeq, BulletList[nBullet].nFrame, 0);
+        ev->pTSprite->owner = -1;
+    }
+}
+
+void FuncBullet(int nObject, int nMessage, int nDamage, int nRun)
+{
+    AIBullet ai;
+    runlist_DispatchEvent(&ai, nObject, nMessage, nDamage, nRun);
+}
 END_PS_NS