diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp index da9cbf91..1ccc90a8 100644 --- a/ISLE/isleapp.cpp +++ b/ISLE/isleapp.cpp @@ -963,15 +963,17 @@ MxResult IsleApp::SetupWindow() SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to open SDL_IOStream for icon: %s", SDL_GetError()); } + if (!SetupLegoOmni()) { + return FAILURE; + } + GameState()->SetSavePath(m_savePath); if (VerifyFilesystem() != SUCCESS) { return FAILURE; } - if (!SetupLegoOmni()) { - return FAILURE; - } + Lego()->LoadSiLoader(); DetectGameVersion(); GameState()->SerializePlayersInfo(LegoStorage::c_read); diff --git a/LEGO1/lego/legoomni/include/legomain.h b/LEGO1/lego/legoomni/include/legomain.h index c5cb23af..8fdf9ecb 100644 --- a/LEGO1/lego/legoomni/include/legomain.h +++ b/LEGO1/lego/legoomni/include/legomain.h @@ -208,6 +208,7 @@ class LegoOmni : public MxOmni { void SetVersion10(MxBool p_version10) { m_version10 = p_version10; } MxBool IsVersion10() { return m_version10; } + LEGO1_EXPORT void LoadSiLoader(); // SYNTHETIC: LEGO1 0x10058b30 // SYNTHETIC: BETA10 0x1008f8d0 diff --git a/LEGO1/lego/legoomni/src/main/legomain.cpp b/LEGO1/lego/legoomni/src/main/legomain.cpp index 04b1dc34..975933ff 100644 --- a/LEGO1/lego/legoomni/src/main/legomain.cpp +++ b/LEGO1/lego/legoomni/src/main/legomain.cpp @@ -354,9 +354,6 @@ MxResult LegoOmni::Create(MxOmniCreateParam& p_param) else { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to create MxTransitionManager"); } - - Extension::Call(Load); - done: return result; // LINE: BETA10 0x1008e35d @@ -728,3 +725,8 @@ void LegoOmni::Resume() MxOmni::Resume(); SetAppCursor(e_cursorArrow); } + +void LegoOmni::LoadSiLoader() +{ + Extension::Call(Load); +}