diff options
| author | Paul Gilbert | 2012-06-06 23:18:56 +1000 |
|---|---|---|
| committer | Paul Gilbert | 2012-06-06 23:18:56 +1000 |
| commit | 3a28323ba26786c89689f8ad637fcc5f4e0cdd9e (patch) | |
| tree | 95be303566b7e183a34661bf2a56f337f4d3fc6c | |
| parent | 53e38106b73e6ad9e6f725857483bfd35e961326 (diff) | |
| download | scummvm-rg350-3a28323ba26786c89689f8ad637fcc5f4e0cdd9e.tar.gz scummvm-rg350-3a28323ba26786c89689f8ad637fcc5f4e0cdd9e.tar.bz2 scummvm-rg350-3a28323ba26786c89689f8ad637fcc5f4e0cdd9e.zip | |
TONY: Added sub-folders for full English game and revised detection entry
| -rw-r--r-- | engines/tony/detection_tables.h | 7 | ||||
| -rw-r--r-- | engines/tony/tony.cpp | 10 |
2 files changed, 11 insertions, 6 deletions
diff --git a/engines/tony/detection_tables.h b/engines/tony/detection_tables.h index 97bcc30f4b..bf4af08d2f 100644 --- a/engines/tony/detection_tables.h +++ b/engines/tony/detection_tables.h @@ -29,8 +29,11 @@ static const TonyGameDescription gameDescriptions[] = { "tony", 0, { - {"roasted.mpr", 0, "06203dbbc85fdd1e6dc8fc211c1a6207", 135911071}, - {"roasted.mpc", 0, "57c4a3860cf899443c357e0078ea6f49", 366773}, + // TODO: AdvancedDetector seems to have a problem where it thinks data1.cab is unrecognised. + // Is it perhaps because the Agos engine also has detection entries for data1.cab? + {"data1.cab", 0, "ce82907242166bfb594d97bdb68f96d2", 4350}, + /*{"roasted.mpr", 0, "06203dbbc85fdd1e6dc8fc211c1a6207", 135911071}, + {"roasted.mpc", 0, "57c4a3860cf899443c357e0078ea6f49", 366773},*/ AD_LISTEND }, Common::EN_ANY, diff --git a/engines/tony/tony.cpp b/engines/tony/tony.cpp index ea378e0fc3..3549b54c2c 100644 --- a/engines/tony/tony.cpp +++ b/engines/tony/tony.cpp @@ -48,6 +48,12 @@ TonyEngine::TonyEngine(OSystem *syst, const TonyGameDescription *gameDesc) : Eng DebugMan.addDebugChannel(kTonyDebugSound, "sound", "Sound debugging"); DebugMan.addDebugChannel(kTonyDebugMusic, "music", "Music debugging"); + // Add folders to the search directory list + const Common::FSNode gameDataDir(ConfMan.get("path")); + SearchMan.addSubDirectoryMatching(gameDataDir, "Voices"); + SearchMan.addSubDirectoryMatching(gameDataDir, "Roasted"); + SearchMan.addSubDirectoryMatching(gameDataDir, "Music"); + // Set up load slot number _initialLoadSlotNumber = -1; if (ConfMan.hasKey("save_slot")) { @@ -436,10 +442,6 @@ bool TonyEngine::openVoiceDatabase() { char id[4]; uint32 numfiles; - // Add the voices folder to the search directory list - const Common::FSNode gameDataDir(ConfMan.get("path")); - SearchMan.addSubDirectoryMatching(gameDataDir, "voices"); - // Open the voices database if (!_vdbFP.open("voices.vdb")) return false; |