diff options
Diffstat (limited to 'engines/mohawk/livingbooks.cpp')
| -rw-r--r-- | engines/mohawk/livingbooks.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp index f80dbfacbd..634ff441b6 100644 --- a/engines/mohawk/livingbooks.cpp +++ b/engines/mohawk/livingbooks.cpp @@ -148,16 +148,10 @@ MohawkEngine_LivingBooks::MohawkEngine_LivingBooks(OSystem *syst, const MohawkGa const Common::FSNode gameDataDir(ConfMan.get("path")); // Rugrats - const Common::FSNode ProgPath = gameDataDir.getChild("program"); - if (ProgPath.exists()) - SearchMan.addDirectory(ProgPath.getPath(), ProgPath, 0, 2); - const Common::FSNode RugPath = gameDataDir.getChild("Rugrats Adventure Game"); - if (RugPath.exists()) - SearchMan.addDirectory(RugPath.getPath(), RugPath, 0, 2); + SearchMan.addSubDirectoryMatching(gameDataDir, "program", 0, 2); + SearchMan.addSubDirectoryMatching(gameDataDir, "Rugrats Adventure Game", 0, 2); // CarmenTQ - const Common::FSNode CTQPath = gameDataDir.getChild("95instal"); - if (CTQPath.exists()) - SearchMan.addDirectory(CTQPath.getPath(), CTQPath, 0, 4); + SearchMan.addSubDirectoryMatching(gameDataDir, "95instal", 0, 4); } MohawkEngine_LivingBooks::~MohawkEngine_LivingBooks() { @@ -317,8 +311,8 @@ void MohawkEngine_LivingBooks::loadBookInfo(const Common::String &filename) { // - fDebugWindow (always 0?) if (_bookInfoFile.hasSection("Globals")) { - const Common::ConfigFile::SectionKeyList globals = _bookInfoFile.getKeys("Globals"); - for (Common::ConfigFile::SectionKeyList::const_iterator i = globals.begin(); i != globals.end(); i++) { + const Common::INIFile::SectionKeyList globals = _bookInfoFile.getKeys("Globals"); + for (Common::INIFile::SectionKeyList::const_iterator i = globals.begin(); i != globals.end(); i++) { Common::String command = Common::String::format("%s = %s", i->key.c_str(), i->value.c_str()); LBCode tempCode(this, 0); uint offset = tempCode.parseCode(command); |