From 43aab2c33e5c79ef86dbc6034741df1a8850f518 Mon Sep 17 00:00:00 2001 From: ecumber Date: Mon, 17 Jul 2023 00:12:09 -0700 Subject: [PATCH] Squashed commit of the following: commit d9148242a322ec54750c89357a0db2154310907d Author: ecumber Date: Sun Jul 16 23:56:54 2023 -0700 Update legoinputmanager.cpp commit 983d08650eb3df0b9103761b4023a6d3395686b2 Author: ecumber Date: Thu Jul 6 21:04:15 2023 -0700 data types commit 4e8aac36ece6f3d7cfff39432ebc4e731876fb75 Author: ecumber Date: Thu Jul 6 12:39:13 2023 -0700 Destroy commit 907801567a8c93ebd242b25b4aa2b00d38eaedc8 Author: ecumber Date: Thu Jul 6 12:15:33 2023 -0700 compile fix commit 91a5f75e938d796f153cc872e46acef2c342818c Author: ecumber Date: Tue Jul 4 13:37:33 2023 -0700 Timer functions commit e77f08f5358b6cc4ee41583f70281c40b95bea29 Author: ecumber Date: Thu Jul 6 02:40:10 2023 -0700 fix commit 30d204b7734a56b4140a3bf53c9825126a1f80c7 Author: ecumber Date: Thu Jul 6 02:39:04 2023 -0700 improvements commit dd4ff493355796c41a6fb328fda1892c0f1fec0a Author: ecumber Date: Tue Jul 4 03:42:47 2023 -0700 Update legoinputmanager.cpp commit 852658cdbc0e6f792a6a79dfc77df3539ea4a15a Author: ecumber Date: Tue Jul 4 03:38:32 2023 -0700 Add ReleaseDX commit 430d4e100811bc00dc983a9fe78aa1482fb92f7f Author: ecumber Date: Tue Jul 4 02:27:12 2023 -0700 Update CMakeLists.txt commit 6fb94f007613e920b1d64775b7b76cb721482884 Author: ecumber Date: Mon Jul 3 13:48:46 2023 -0700 Move to new branch --- CMakeLists.txt | 1 + LEGO1/legoinputmanager.cpp | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e3b28ec6..3485f285 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -190,6 +190,7 @@ if (ISLE_USE_SMARTHEAP) target_link_libraries(lego1 PRIVATE SmartHeap::SmartHeap) endif() +target_include_directories(lego1 PRIVATE "dx5sdk/inc") # Link libraries target_link_libraries(lego1 PRIVATE ddraw dsound winmm "${CMAKE_SOURCE_DIR}/dx5sdk/lib/dinput.lib" "${CMAKE_SOURCE_DIR}/dx5sdk/lib/dxguid.lib") diff --git a/LEGO1/legoinputmanager.cpp b/LEGO1/legoinputmanager.cpp index bfc0c4df..026037db 100644 --- a/LEGO1/legoinputmanager.cpp +++ b/LEGO1/legoinputmanager.cpp @@ -2,6 +2,7 @@ #include "decomp.h" #include "legoomni.h" +#include "mxautolocker.h" //DECOMP_SIZE_ASSERT(LegoInputManager, 0x338); // 0x10059085 @@ -47,7 +48,7 @@ void LegoInputManager::QueueEvent(NotificationId id, unsigned char p2, MxLong p3 // OFFSET: LEGO1 0x1005c470 STUB void LegoInputManager::Register(MxCore *) { - // TODO + MxAutoLocker* autolocker = new MxAutoLocker(&m_criticalsection); } // OFFSET: LEGO1 0x1005c5c0 STUB @@ -67,7 +68,7 @@ void LegoInputManager::UnRegister(MxCore *) void LegoInputManager::Destroy() { ReleaseDX(); - + // `scalar_deleting_destructor' if (m_unknown_classptr68 != NULL) delete[] m_unknown_classptr68; if (m_controlManager != NULL) delete[] m_controlManager; return;