[Scummvm-cvs-logs] SF.net SVN: scummvm:[41587] scummvm/trunk/engines/tinsel

[Hkz at users.sourceforge.net]

Revision: 41587
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41587&view=rev
Author:   Hkz
Date:     2009-06-16 18:58:21 +0000 (Tue, 16 Jun 2009)

Log Message:
-----------
tinsel: check only english.txt for DW1 psx version detection, and use recursive "SearchMan.addDirectory()" to obtain subdirs for Discworld PSX datafiles

Modified Paths:
--------------
    scummvm/trunk/engines/tinsel/detection.cpp
    scummvm/trunk/engines/tinsel/tinsel.cpp

Modified: scummvm/trunk/engines/tinsel/detection.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/detection.cpp	2009-06-16 17:52:32 UTC (rev 41586)
+++ scummvm/trunk/engines/tinsel/detection.cpp	2009-06-16 18:58:21 UTC (rev 41587)
@@ -297,15 +297,11 @@
 		TINSEL_V1,
 	},
 
-	{	// UK multilanguage PSX CD
+	{	// Discworld PSX CD
 		{
 			"dw",
 			"CD",
 			{
-				{"french.txt", 0, "e7020d35f58d0d187052ac406d86cc87", 273918},
-				{"german.txt", 0, "6e2c0f0655bc3cec5a6b3552164ec984", 263942},
-				{"italian.txt", 0, "15f0703f85477d7fab4280bf938b61c1", 239830},
-				{"spanish.txt", 0, "bda9bea9078d1483409082a3e180378a", 236702},
 				{"english.txt", 0, "7526cfc3a64e00f223795de476b4e2c9", 230326},
 				{NULL, 0, NULL, 0}
 			},

Modified: scummvm/trunk/engines/tinsel/tinsel.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/tinsel.cpp	2009-06-16 17:52:32 UTC (rev 41586)
+++ scummvm/trunk/engines/tinsel/tinsel.cpp	2009-06-16 18:58:21 UTC (rev 41587)
@@ -850,19 +850,8 @@
 	Common::File::addDefaultDirectory(_gameDataDir.getChild("dw2"));
 
 	// Add subfolders needed for psx versions of Discworld 1	
-	if(TinselV1PSX) {
-		Common::File::addDefaultDirectory(_gameDataDir.getChild("MIDI"));
-		Common::File::addDefaultDirectory(_gameDataDir.getChild("SAMPLES"));
-		Common::File::addDefaultDirectory(_gameDataDir.getChild("GFX"));
-		Common::File::addDefaultDirectory(_gameDataDir.getChild("GFX").getChild("GFXAB"));
-		Common::File::addDefaultDirectory(_gameDataDir.getChild("GFX").getChild("GFXC"));
-		Common::File::addDefaultDirectory(_gameDataDir.getChild("GFX").getChild("GFXDG"));
-		Common::File::addDefaultDirectory(_gameDataDir.getChild("GFX").getChild("GFXHL"));
-		Common::File::addDefaultDirectory(_gameDataDir.getChild("GFX").getChild("GFXMO"));
-		Common::File::addDefaultDirectory(_gameDataDir.getChild("GFX").getChild("GFXP"));
-		Common::File::addDefaultDirectory(_gameDataDir.getChild("GFX").getChild("GFXRS"));
-		Common::File::addDefaultDirectory(_gameDataDir.getChild("GFX").getChild("GFXTW"));
-	}
+	if(TinselV1PSX)
+		SearchMan.addDirectory(_gameDataDir.getPath(), _gameDataDir, 0, 3, true);
 
 	const GameSettings *g;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.