diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index 28b5aa15..54259e63 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -78,8 +78,8 @@ if(DOWNLOAD_DEPENDENCIES) include(FetchContent) FetchContent_Populate( libweaver - URL https://github.com/isledecomp/SIEdit/archive/6da93b2072c41c41d526b8b9df7d4292be1f0f55.tar.gz - URL_MD5 ae59007fcb9efadc06c67621e1e107cb + URL https://github.com/isledecomp/SIEdit/archive/ae447259389f3bf8273c7e7a4844743faf7cbdb8.tar.gz + URL_MD5 dee68424fde8db6d5cef3b9034a8151f ) else() set(libweaver_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libweaver") diff --git a/3rdparty/libweaver b/3rdparty/libweaver index 6da93b20..ae447259 160000 --- a/3rdparty/libweaver +++ b/3rdparty/libweaver @@ -1 +1 @@ -Subproject commit 6da93b2072c41c41d526b8b9df7d4292be1f0f55 +Subproject commit ae447259389f3bf8273c7e7a4844743faf7cbdb8 diff --git a/extensions/src/siloader.cpp b/extensions/src/siloader.cpp index aff434c4..ab23b4a7 100644 --- a/extensions/src/siloader.cpp +++ b/extensions/src/siloader.cpp @@ -140,10 +140,11 @@ bool SiLoader::LoadFile(const char* p_file) MxString path = MxString(MxOmni::GetHD()) + p_file; path.MapPathToFilesystem(); - if (si.Read(path.GetData()) != si::Interleaf::ERROR_SUCCESS) { + if (si.Read(path.GetData(), si::Interleaf::ObjectsOnly | si::Interleaf::NoInfo) != si::Interleaf::ERROR_SUCCESS) { path = MxString(MxOmni::GetCD()) + p_file; path.MapPathToFilesystem(); - if (si.Read(path.GetData()) != si::Interleaf::ERROR_SUCCESS) { + if (si.Read(path.GetData(), si::Interleaf::ObjectsOnly | si::Interleaf::NoInfo) != + si::Interleaf::ERROR_SUCCESS) { SDL_Log("Could not parse SI file %s", p_file); return false; }