[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.436,1.437

[Max Horn]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6146/simon

Modified Files:
	simon.cpp 
Log Message:
Enhanced default directory support in the File class; now one can specify arbitrary many default search directories

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.436
retrieving revision 1.437
diff -u -d -r1.436 -r1.437
--- simon.cpp	27 Jun 2004 22:14:34 -0000	1.436
+++ simon.cpp	28 Jun 2004 00:06:16 -0000	1.437
@@ -269,17 +269,29 @@
 		SOUND_INDEX_BASE = 0;
 	}
 
-	if (_game & GF_MAC)
+	if (_game & GF_MAC) {
 		gss = PTR(simon2mac_settings);
-	else if ((_game & GF_SIMON2) && (_game & GF_TALKIE))
+
+		// Add default file directories
+		File::addDefaultDirectory(_gameDataPath + "/voices/");
+		File::addDefaultDirectory(_gameDataPath + "/VOICES/");
+	} else if ((_game & GF_SIMON2) && (_game & GF_TALKIE))
 		gss = PTR(simon2win_settings);
 	else if (_game & GF_SIMON2)
 		gss = PTR(simon2dos_settings);
-	else if (_game & GF_ACORN)
+	else if (_game & GF_ACORN) {
 		gss = PTR(simon1acorn_settings);
-	else if (_game & GF_AMIGA)
+
+		// Add default file directories
+		File::addDefaultDirectory(_gameDataPath + "/execute/");
+		File::addDefaultDirectory(_gameDataPath + "/EXECUTE/");
+	} else if (_game & GF_AMIGA) {
 		gss = PTR(simon1amiga_settings);
-	else if (_game & GF_DEMO)
+
+		// Add default file directories
+		File::addDefaultDirectory(_gameDataPath + "/voices/");
+		File::addDefaultDirectory(_gameDataPath + "/VOICES/");
+	} else if (_game & GF_DEMO)
 		gss = PTR(simon1demo_settings);
 	else
 		gss = PTR(simon1_settings);