From dea94c5cfb18702ca64ff76f90779c5259536303 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sun, 18 Jun 2023 21:40:53 -0700 Subject: [PATCH] minor adjustments --- ISLE/isle.cpp | 4 +++- ISLE/main.cpp | 4 ++-- LEGO1/mxdsaction.h | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ISLE/isle.cpp b/ISLE/isle.cpp index cb96846b..d3bd8f3d 100644 --- a/ISLE/isle.cpp +++ b/ISLE/isle.cpp @@ -396,7 +396,9 @@ LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) switch (uMsg) { case WM_KEYDOWN: - if (HIWORD(lParam) & KF_REPEAT) { + // While this probably should be (HIWORD(lParam) & KF_REPEAT), this seems + // to be what the assembly is actually doing + if (lParam & (KF_REPEAT << 16)) { return DefWindowProcA(hWnd, WM_KEYDOWN, wParam, lParam); } keyCode = wParam; diff --git a/ISLE/main.cpp b/ISLE/main.cpp index 7320cd96..651bfffc 100644 --- a/ISLE/main.cpp +++ b/ISLE/main.cpp @@ -52,7 +52,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine // Throw error if sound unavailable if (!soundReady) { MessageBoxA(NULL, "\"LEGO\xAE Island\" is not detecting a DirectSound compatible sound card. Please quit all other applications and try again.", - "Lego Island Error", MB_OK | MB_APPLMODAL); + "Lego Island Error", MB_OK); return 0; } @@ -61,7 +61,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine // Create window if (g_isle->setupWindow(hInstance) != SUCCESS) { - MessageBoxA(NULL, "\"LEGO\xAE Island\" failed to start. Please quit all other applications and try again.", "LEGO\xAE Island Error", MB_OK | MB_APPLMODAL); + MessageBoxA(NULL, "\"LEGO\xAE Island\" failed to start. Please quit all other applications and try again.", "LEGO\xAE Island Error", MB_OK); return 0; } diff --git a/LEGO1/mxdsaction.h b/LEGO1/mxdsaction.h index 23f3d7f0..aa5a7e4b 100644 --- a/LEGO1/mxdsaction.h +++ b/LEGO1/mxdsaction.h @@ -47,8 +47,9 @@ class MxDSAction int m_unk8c; int m_unk90; - void setAtomId(MxAtomId &atomId) { - this->m_atomId = atomId; + void setAtomId(MxAtomId &atomId) + { + this->m_atomId = atomId; } };