[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.248,1.249

Chris Apers chrilith at users.sourceforge.net
Fri Oct 8 09:13:30 CEST 2004


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

Modified Files:
	scumm.cpp 
Log Message:
Prevent double slash in path

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -d -r1.248 -r1.249
--- scumm.cpp	7 Oct 2004 20:55:22 -0000	1.248
+++ scumm.cpp	8 Oct 2004 16:08:07 -0000	1.249
@@ -438,15 +438,15 @@
 	// Add default file directories.
 	if (((_features & GF_AMIGA) || (_features & GF_ATARI_ST)) && (_version <= 4)) {
 		// This is for the Amiga version of Indy3/Loom/Maniac/Zak
-		File::addDefaultDirectory(_gameDataPath + "/ROOMS/");
-		File::addDefaultDirectory(_gameDataPath + "/rooms/");
+		File::addDefaultDirectory(_gameDataPath + "ROOMS/");
+		File::addDefaultDirectory(_gameDataPath + "rooms/");
 	}
 
 	if ((_features & GF_MACINTOSH) && (_version == 3)) {
 		// This is for the Mac version of Indy3/Loom
-		File::addDefaultDirectory(_gameDataPath + "/Rooms 1/");
-		File::addDefaultDirectory(_gameDataPath + "/Rooms 2/");
-		File::addDefaultDirectory(_gameDataPath + "/Rooms 3/");
+		File::addDefaultDirectory(_gameDataPath + "Rooms 1/");
+		File::addDefaultDirectory(_gameDataPath + "Rooms 2/");
+		File::addDefaultDirectory(_gameDataPath + "Rooms 3/");
 	}
 
 #ifdef MACOSX
@@ -467,16 +467,16 @@
 #endif
 	if (_version == 8) {
 		// This is for COMI
-		File::addDefaultDirectory(_gameDataPath + "/RESOURCE/");
-		File::addDefaultDirectory(_gameDataPath + "/resource/");
+		File::addDefaultDirectory(_gameDataPath + "RESOURCE/");
+		File::addDefaultDirectory(_gameDataPath + "resource/");
 	}
 
 	if (_version == 7) {
 		// This is for Full Throttle & The Dig
-		File::addDefaultDirectory(_gameDataPath + "/VIDEO/");
-		File::addDefaultDirectory(_gameDataPath + "/video/");
-		File::addDefaultDirectory(_gameDataPath + "/DATA/");
-		File::addDefaultDirectory(_gameDataPath + "/data/");
+		File::addDefaultDirectory(_gameDataPath + "VIDEO/");
+		File::addDefaultDirectory(_gameDataPath + "video/");
+		File::addDefaultDirectory(_gameDataPath + "DATA/");
+		File::addDefaultDirectory(_gameDataPath + "data/");
 	}
 
 	// The mac versions of Sam&Max, DOTT, FT and The Dig used a special meta





More information about the Scummvm-git-logs mailing list