From d800df621c28e55b1666b3165827b204847d54ca Mon Sep 17 00:00:00 2001
From: Jonathan Voss <658471+jonathan-voss@users.noreply.github.com>
Date: Wed, 17 Jan 2024 00:09:43 -0600
Subject: [PATCH] Convert CAvaraApp Dispose to C++ destructor

---
 src/game/CAvaraApp.cpp  | 1 -
 src/game/CAvaraGame.cpp | 4 +---
 src/game/CAvaraGame.h   | 4 ++--
 src/tests.cpp           | 9 ++++++++-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/game/CAvaraApp.cpp b/src/game/CAvaraApp.cpp
index 0a519dc6..a287c69d 100755
--- a/src/game/CAvaraApp.cpp
+++ b/src/game/CAvaraApp.cpp
@@ -136,7 +136,6 @@ CAvaraAppImpl::CAvaraAppImpl() : CApplication("Avara") {
 }
 
 CAvaraAppImpl::~CAvaraAppImpl() {
-    itsGame->Dispose();
     DeallocParser();
 }
 
diff --git a/src/game/CAvaraGame.cpp b/src/game/CAvaraGame.cpp
index ebd10563..81ea3d0f 100755
--- a/src/game/CAvaraGame.cpp
+++ b/src/game/CAvaraGame.cpp
@@ -155,7 +155,7 @@ CSoundHub* CAvaraGame::CreateSoundHub() {
     return soundHub;
 }
 
-void CAvaraGame::Dispose() {
+CAvaraGame::~CAvaraGame() {
     CAbstractActor *nextActor;
 
     spectatePlayer = NULL;
@@ -184,8 +184,6 @@ void CAvaraGame::Dispose() {
 
     // DisposePolyWorld(&itsPolyWorld);
     DisposePtr((Ptr)locatorTable);
-
-    CDirectObject::Dispose();
 }
 
 CAbstractActor *CAvaraGame::FindIdent(long ident) {
diff --git a/src/game/CAvaraGame.h b/src/game/CAvaraGame.h
index 2efcacae..d3c781ad 100644
--- a/src/game/CAvaraGame.h
+++ b/src/game/CAvaraGame.h
@@ -66,7 +66,7 @@ class CIncarnator;
 class CScoreKeeper;
 class CAbstractYon;
 
-class CAvaraGame : public CDirectObject {
+class CAvaraGame {
 public:
     std::string loadedFilename = "";
     std::string loadedLevel = "";
@@ -229,7 +229,7 @@ class CAvaraGame : public CDirectObject {
     virtual void GameStart();
     virtual bool GameTick();
     virtual void GameStop();
-    virtual void Dispose();
+    virtual ~CAvaraGame();
 
     virtual void SpectateNext();
     virtual void SpectatePrevious();
diff --git a/src/tests.cpp b/src/tests.cpp
index 447025d8..bdfa4185 100644
--- a/src/tests.cpp
+++ b/src/tests.cpp
@@ -188,6 +188,12 @@ class TestGame : public CAvaraGame {
     }
 };
 
+class TestWalkerActor : public CWalkerActor {
+    void ResetCamera() {
+
+    }
+};
+
 class HectorTestScenario {
 public:
     TestApp app;
@@ -205,7 +211,7 @@ class HectorTestScenario {
         game->EndScript();
         app.GetNet()->ChangeNet(kNullNet, "");
         game->LevelReset(false);
-        hector = new CWalkerActor();
+        hector = new TestWalkerActor();
         hector->BeginScript();
         hector->EndScript();
         game->itsNet->playerTable[0]->SetPlayer(hector);
@@ -215,6 +221,7 @@ class HectorTestScenario {
         hector->location[2] = hectorZ;
         hector->location[3] = FIX1;
         game->AddActor(hector);
+        game->freshPlayerList = 0;
         game->GameStart();
     }
 };