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

Travis Howell kirben at users.sourceforge.net
Sun Jun 27 17:41:06 CEST 2004


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

Modified Files:
	simon.cpp 
Log Message:

Correct default paths


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -d -r1.437 -r1.438
--- simon.cpp	28 Jun 2004 00:06:16 -0000	1.437
+++ simon.cpp	28 Jun 2004 00:40:25 -0000	1.438
@@ -287,15 +287,33 @@
 		File::addDefaultDirectory(_gameDataPath + "/EXECUTE/");
 	} else if (_game & GF_AMIGA) {
 		gss = PTR(simon1amiga_settings);
-
-		// 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);
 
+	if (!(_game & GF_SIMON2) && (_game & GF_TALKIE)) {
+		// Add default file directories
+		switch(_language) {
+		case 20:
+			File::addDefaultDirectory(_gameDataPath + "/hebrew/");
+			File::addDefaultDirectory(_gameDataPath + "/HEBREW/");
+			break;
+		case  5:
+			File::addDefaultDirectory(_gameDataPath + "/spanish/");
+			File::addDefaultDirectory(_gameDataPath + "/SPANISH/");
+			break;
+		case  3:
+			File::addDefaultDirectory(_gameDataPath + "/ITALIAN/");
+			File::addDefaultDirectory(_gameDataPath + "/ITALIAN/");
+			break;
+		case  2:
+			File::addDefaultDirectory(_gameDataPath + "/french/");
+			File::addDefaultDirectory(_gameDataPath + "/FRENCH/");
+			break;
+		}
+	}
+
 	_key_pressed = 0;
 
 	_game_file = 0;





More information about the Scummvm-git-logs mailing list