diff --git a/CMakeLists.txt b/CMakeLists.txt index 53963915..cd2e2cd0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -415,8 +415,8 @@ set_property(TARGET lego1 PROPERTY SUFFIX ".DLL") if (ISLE_BUILD_APP) add_executable(isle WIN32 ISLE/res/isle.rc - ISLE/isleapp.cpp ISLE/define.cpp + ISLE/isleapp.cpp ) target_compile_definitions(isle PRIVATE ISLE_APP) diff --git a/ISLE/define.cpp b/ISLE/define.cpp index c1f020fa..48fd907e 100644 --- a/ISLE/define.cpp +++ b/ISLE/define.cpp @@ -32,9 +32,3 @@ int g_targetDepth = 16; // GLOBAL: ISLE 0x410064 int g_reqEnableRMDevice = 0; - -// GLOBAL: ISLE 0x4101bc -int g_startupDelay = 200; - -// GLOBAL: ISLE 0x4101c0 -MxLong g_lastFrameTime = 0; diff --git a/ISLE/define.h b/ISLE/define.h index 3f92244b..6d1a59bb 100644 --- a/ISLE/define.h +++ b/ISLE/define.h @@ -21,7 +21,5 @@ extern int g_targetWidth; extern int g_targetHeight; extern int g_targetDepth; extern int g_reqEnableRMDevice; -extern int g_startupDelay; -extern MxLong g_lastFrameTime; #endif // DEFINE_H diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp index c4897a2b..1e61fdfb 100644 --- a/ISLE/isleapp.cpp +++ b/ISLE/isleapp.cpp @@ -765,6 +765,12 @@ void IsleApp::LoadConfig() // FUNCTION: ISLE 0x402c20 inline void IsleApp::Tick(BOOL sleepIfNotNextFrame) { + // GLOBAL: ISLE 0x4101c0 + static MxLong g_lastFrameTime = 0; + + // GLOBAL: ISLE 0x4101bc + static int g_startupDelay = 200; + if (!this->m_windowActive) { Sleep(0); return;