diff options
| author | BLooperZ | 2019-11-24 01:04:10 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2019-12-07 21:42:14 +0200 |
| commit | 84d6d0307f4561ebd344fff06b1e1df0d97c70ec (patch) | |
| tree | 94ecdfcf6f1258d976a91a9437b2d4715cc434c8 | |
| parent | 03ced8ac950a63aa36ec99f35b25186d0f673366 (diff) | |
| download | scummvm-rg350-84d6d0307f4561ebd344fff06b1e1df0d97c70ec.tar.gz scummvm-rg350-84d6d0307f4561ebd344fff06b1e1df0d97c70ec.tar.bz2 scummvm-rg350-84d6d0307f4561ebd344fff06b1e1df0d97c70ec.zip | |
COMPOSER: read book.mac before book.ini
| -rw-r--r-- | engines/composer/composer.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/composer/composer.cpp b/engines/composer/composer.cpp index 0b5eee3bf0..8fee5d7a7a 100644 --- a/engines/composer/composer.cpp +++ b/engines/composer/composer.cpp @@ -85,14 +85,15 @@ Common::Error ComposerEngine::run() { _queuedScripts[i]._scriptId = 0; } - if (!_bookIni.loadFromFile("book.ini")) { - if (!_bookIni.loadFromFile("demo.ini") && !_bookIni.loadFromFile("ls_demo.ini") && !_bookIni.loadFromFile("by_demo.ini")) { + // NOTE: check book.mac before book.ini for easier platform check (to find the proper section in INI) + if (!(_bookIni.loadFromFile("book.mac") || _bookIni.loadFromFile("demo.mac"))) { + if (!(_bookIni.loadFromFile("book.ini") || _bookIni.loadFromFile("demo.ini") + || _bookIni.loadFromFile("ls_demo.ini") || _bookIni.loadFromFile("by_demo.ini"))) { _directoriesToStrip = 0; if (!_bookIni.loadFromFile("programs/book.ini")) { // mac version? if (!_bookIni.loadFromFile("Darby the Dragon.ini")) if (!_bookIni.loadFromFile("Gregory.ini")) - if (!_bookIni.loadFromFile("demo.mac") && !_bookIni.loadFromFile("book.mac")) error("failed to find book.ini"); } } |