From 99ee2122132645bb7e31e551a99adf13d7f90016 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Thu, 11 Jan 2024 10:48:00 -0500
Subject: [PATCH] Fix inclusion of MxPresenter class in ISLE

---
 CMakeLists.txt                        | 2 ++
 LEGO1/omni/include/mxpresenter.h      | 6 +++++-
 LEGO1/omni/src/common/mxpresenter.cpp | 6 ------
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a3519ea9..7efecd09 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -291,6 +291,8 @@ if (ISLE_BUILD_APP)
     ISLE/define.cpp
   )
 
+  target_compile_definitions(isle PRIVATE ISLE_APP)
+
   target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/util")
   target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1")
   target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include")
diff --git a/LEGO1/omni/include/mxpresenter.h b/LEGO1/omni/include/mxpresenter.h
index 5659402b..27c40745 100644
--- a/LEGO1/omni/include/mxpresenter.h
+++ b/LEGO1/omni/include/mxpresenter.h
@@ -28,7 +28,7 @@ public:
 
 	MxPresenter() { Init(); }
 
-#ifdef COMPAT_MODE
+#ifdef ISLE_APP
 	__declspec(dllexport) virtual ~MxPresenter() override; // vtable+0x00
 #else
 	// FUNCTION: LEGO1 0x1000bf00
@@ -73,8 +73,12 @@ public:
 	virtual void Unk5Tickle() { ProgressTickleState(TickleState_Done); }; // vtable+0x28
 
 protected:
+#ifdef ISLE_APP
+	__declspec(dllexport) virtual void DoneTickle(); // vtable+0x2c
+#else
 	// FUNCTION: LEGO1 0x1000bee0
 	__declspec(dllexport) virtual void DoneTickle() { ProgressTickleState(TickleState_Idle); }; // vtable+0x2c
+#endif
 
 	__declspec(dllexport) virtual void ParseExtra(); // vtable+0x30
 
diff --git a/LEGO1/omni/src/common/mxpresenter.cpp b/LEGO1/omni/src/common/mxpresenter.cpp
index 6582d43c..f08b0f30 100644
--- a/LEGO1/omni/src/common/mxpresenter.cpp
+++ b/LEGO1/omni/src/common/mxpresenter.cpp
@@ -18,12 +18,6 @@
 
 DECOMP_SIZE_ASSERT(MxPresenter, 0x40);
 
-#ifdef COMPAT_MODE
-MxPresenter::~MxPresenter()
-{
-}
-#endif
-
 // FUNCTION: LEGO1 0x100b4d50
 void MxPresenter::Init()
 {