TONY: Added sub-folders for full English game and revised detection e…

…ntry
scummvm · Jun 6, 2012 · 3a28323 · 3a28323
1 parent 53e3810
commit 3a28323
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git 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
@@ -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;