isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2024-11-14 19:15:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

SDL3 fixes (#32)
Some checks failed
Build / Current msys2 mingw32 (push) Has been cancelled
Details
Build / Current msys2 mingw64 (push) Has been cancelled
Details
Build / Current MSVC (32-bit) (push) Has been cancelled
Details
Build / Current MSVC (64-bit) (push) Has been cancelled
Details
Format / C++ (push) Has been cancelled
Details
Naming / C++ (push) Has been cancelled
Details

Browse source
This commit is contained in:
Christian Semmler 2024-10-03 12:50:32 -07:00 committed by GitHub
parent 9397458854
commit e7a604c61c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ISLE/isleapp.cpp
View file

@ -236,7 +236,7 @@ SDL_AppResult SDL_AppInit(void** appstate, int argc, char** argv)
{ {
*appstate = NULL; *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_ShowSimpleMessageBox(
SDL_MESSAGEBOX_ERROR, SDL_MESSAGEBOX_ERROR,
"LEGO® Island Error", "LEGO® Island Error",
@ -406,7 +406,7 @@ SDL_AppResult SDL_AppEvent(void* appstate, SDL_Event* event)
return SDL_APP_CONTINUE; return SDL_APP_CONTINUE;
} }
void SDL_AppQuit(void* appstate) void SDL_AppQuit(void* appstate, SDL_AppResult result)
{ {
if (appstate != NULL) { if (appstate != NULL) {
SDL_DestroyWindow((SDL_Window*) appstate); SDL_DestroyWindow((SDL_Window*) appstate);

2
LEGO1/lego/legoomni/include/legoinputmanager.h
View file

@ -147,7 +147,7 @@ class LegoInputManager : public MxPresenter {
MxBool m_unk0x81; // 0x81 MxBool m_unk0x81; // 0x81
LegoControlManager* m_controlManager; // 0x84 LegoControlManager* m_controlManager; // 0x84
MxBool m_unk0x88; // 0x88 MxBool m_unk0x88; // 0x88
const Uint8* m_keyboardState; const bool* m_keyboardState;
MxBool m_unk0x195; // 0x195 MxBool m_unk0x195; // 0x195
MxS32 m_joyid; // 0x198 MxS32 m_joyid; // 0x198
MxS32 m_joystickIndex; // 0x19c MxS32 m_joystickIndex; // 0x19c