ScummVM/scummvm
1
0 Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

ULTIMA8: Make loading work with different path configurations

Browse Source
This commit is contained in:
Matthew Duggan committed 2021-05-05 20:57:46 +09:00
1 parent a51f5e9c1a
commit 12f8e8679e
2 files changed
+11 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

engines/ultima/ultima8/filesys/file_system.cpp
+7 -2
View File
@@ -47,8 +47,13 @@ FileSystem::~FileSystem() {
// Open a streaming file as readable. Streamed (0 on failure)
Common::SeekableReadStream *FileSystem::ReadFile(const string &vfn) {
Common::SeekableReadStream *readStream;
if (!rawOpen(readStream, vfn))
return nullptr;
if (!rawOpen(readStream, vfn)) {
// Some games have some files in a "data" subdir.
string altpath = string::format("data/%s", vfn.c_str());
if (!rawOpen(readStream, altpath)) {
return nullptr;
}
}
return readStream;
}
engines/ultima/ultima8/games/remorse_game.cpp
+4 -4
View File
@@ -75,8 +75,8 @@ bool RemorseGame::loadFiles() {
if (!loadPalette("static/gamepal.pal", PaletteManager::Pal_Game))
return false;
if (GAME_IS_REGRET) {
if (!loadPalette("static/cred.pal", PaletteManager::Pal_Cred))
return false;
// This one is not used at the moment, so allowed to fail
loadPalette("static/cred.pal", PaletteManager::Pal_Cred);
}
if (!loadPalette("static/diff.pal", PaletteManager::Pal_Diff))
return false;
@@ -84,8 +84,8 @@ bool RemorseGame::loadFiles() {
return false;
if (!loadPalette("static/misc2.pal", PaletteManager::Pal_Misc2))
return false;
if (!loadPalette("static/star.pal", PaletteManager::Pal_Star))
return false;
// We don't use his one at the moment, ok to fail.
loadPalette("static/star.pal", PaletteManager::Pal_Star);
pout << "Load GameData" << Std::endl;
GameData::get_instance()->loadRemorseData();