From 389044147ee4b65bae3d0ce9f3479f7ce212b5ea Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Thu, 3 Oct 2024 12:42:48 -0700 Subject: [PATCH] SDL3 fixes --- ISLE/isleapp.cpp | 4 ++-- LEGO1/lego/legoomni/include/legoinputmanager.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp index 139bfaa1..76c24cae 100644 --- a/ISLE/isleapp.cpp +++ b/ISLE/isleapp.cpp @@ -236,7 +236,7 @@ SDL_AppResult SDL_AppInit(void** appstate, int argc, char** argv) { *appstate = NULL; - if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER) != SDL_TRUE) { + if (!SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO)) { SDL_ShowSimpleMessageBox( SDL_MESSAGEBOX_ERROR, "LEGO® Island Error", @@ -406,7 +406,7 @@ SDL_AppResult SDL_AppEvent(void* appstate, SDL_Event* event) return SDL_APP_CONTINUE; } -void SDL_AppQuit(void* appstate) +void SDL_AppQuit(void* appstate, SDL_AppResult result) { if (appstate != NULL) { SDL_DestroyWindow((SDL_Window*) appstate); diff --git a/LEGO1/lego/legoomni/include/legoinputmanager.h b/LEGO1/lego/legoomni/include/legoinputmanager.h index c2686146..d8c7f1cf 100644 --- a/LEGO1/lego/legoomni/include/legoinputmanager.h +++ b/LEGO1/lego/legoomni/include/legoinputmanager.h @@ -147,7 +147,7 @@ class LegoInputManager : public MxPresenter { MxBool m_unk0x81; // 0x81 LegoControlManager* m_controlManager; // 0x84 MxBool m_unk0x88; // 0x88 - const Uint8* m_keyboardState; + const bool* m_keyboardState; MxBool m_unk0x195; // 0x195 MxS32 m_joyid; // 0x198 MxS32 m_joystickIndex; // 0x19c