mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 00:14:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix inclusion of MxPresenter class in ISLE

Browse Source
This commit is contained in:
Christian Semmler
2024-01-11 10:48:00 -05:00
parent 516e16faf6
commit 99ee212213
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -291,6 +291,8 @@ if (ISLE_BUILD_APP)
ISLE/define.cpp 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}/util")
target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1") target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1")
target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include") target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include")

6
LEGO1/omni/include/mxpresenter.h
View File

@@ -28,7 +28,7 @@ public:
MxPresenter() { Init(); } MxPresenter() { Init(); }
#ifdef COMPAT_MODE #ifdef ISLE_APP
__declspec(dllexport) virtual ~MxPresenter() override; // vtable+0x00 __declspec(dllexport) virtual ~MxPresenter() override; // vtable+0x00
#else #else
// FUNCTION: LEGO1 0x1000bf00 // FUNCTION: LEGO1 0x1000bf00
@@ -73,8 +73,12 @@ public:
virtual void Unk5Tickle() { ProgressTickleState(TickleState_Done); }; // vtable+0x28 virtual void Unk5Tickle() { ProgressTickleState(TickleState_Done); }; // vtable+0x28
protected: protected:
#ifdef ISLE_APP
__declspec(dllexport) virtual void DoneTickle(); // vtable+0x2c
#else
// FUNCTION: LEGO1 0x1000bee0 // FUNCTION: LEGO1 0x1000bee0
__declspec(dllexport) virtual void DoneTickle() { ProgressTickleState(TickleState_Idle); }; // vtable+0x2c __declspec(dllexport) virtual void DoneTickle() { ProgressTickleState(TickleState_Idle); }; // vtable+0x2c
#endif
__declspec(dllexport) virtual void ParseExtra(); // vtable+0x30 __declspec(dllexport) virtual void ParseExtra(); // vtable+0x30

6
LEGO1/omni/src/common/mxpresenter.cpp
View File

@@ -18,12 +18,6 @@
DECOMP_SIZE_ASSERT(MxPresenter, 0x40); DECOMP_SIZE_ASSERT(MxPresenter, 0x40);
#ifdef COMPAT_MODE
MxPresenter::~MxPresenter()
{
}
#endif
// FUNCTION: LEGO1 0x100b4d50 // FUNCTION: LEGO1 0x100b4d50
void MxPresenter::Init() void MxPresenter::Init()
{ {