diff --git a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp index c9c4a9ec..d4dda2e5 100644 --- a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp +++ b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp @@ -29,6 +29,7 @@ #include "viewmanager/viewmanager.h" #include +#include #include #include #include @@ -640,6 +641,8 @@ MxResult LegoAnimationManager::LoadWorldInfo(LegoOmni::World p_worldId) } strcat(path, filename); + MxString::MapPathToFilesystem(path); + SDL_PathInfo pathInfo; if (!SDL_GetPathInfo(path, &pathInfo) || pathInfo.type != SDL_PATHTYPE_FILE) { @@ -650,8 +653,17 @@ MxResult LegoAnimationManager::LoadWorldInfo(LegoOmni::World p_worldId) } strcat(path, filename); + MxString::MapPathToFilesystem(path); if (!SDL_GetPathInfo(path, &pathInfo) || pathInfo.type != SDL_PATHTYPE_FILE) { + char buffer[256]; + SDL_snprintf( + buffer, + sizeof(buffer), + "\"LEGO® Island\" failed to load %s.\nPlease make sure this file is available on HD/CD.", + filename + ); + SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "LEGO® Island Error", buffer, NULL); goto done; } } diff --git a/LEGO1/lego/sources/misc/legostorage.cpp b/LEGO1/lego/sources/misc/legostorage.cpp index 3ddcbf0c..45105d0a 100644 --- a/LEGO1/lego/sources/misc/legostorage.cpp +++ b/LEGO1/lego/sources/misc/legostorage.cpp @@ -128,14 +128,6 @@ LegoResult LegoFile::Open(const char* p_name, LegoU32 p_mode) path.MapPathToFilesystem(); if (!(m_file = SDL_IOFromFile(path.GetData(), mode))) { - char buffer[256]; - SDL_snprintf( - buffer, - sizeof(buffer), - "\"LEGO® Island\" failed to load %s.\nPlease make sure this file is available on HD/CD.", - path.GetData() - ); - SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "LEGO® Island Error", buffer, NULL); return FAILURE; } return SUCCESS;