[Scummvm-cvs-logs] CVS: scummvm gameDetector.cpp,1.72,1.73

Ruediger Hanke tomjoad at users.sourceforge.net
Thu Jul 4 12:45:01 CEST 2002


Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv31054

Modified Files:
	gameDetector.cpp 
Log Message:
No slash must be appended to path after colon on MorphOS - CMI did not load from CD because of this

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetector.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- gameDetector.cpp	4 Jul 2002 15:48:17 -0000	1.72
+++ gameDetector.cpp	4 Jul 2002 19:43:58 -0000	1.73
@@ -538,7 +538,11 @@
 	if (!_gameDataPath) {
 		warning("No path was provided. Assuming the data files are in the current directory");
 		_gameDataPath = Scumm::Strdup("");
-	} else if (_gameDataPath[strlen(_gameDataPath)-1] != '/' && _gameDataPath[strlen(_gameDataPath)-1] != '\\') {
+	} else if (_gameDataPath[strlen(_gameDataPath)-1] != '/'
+#ifdef __MORPHOS__
+					&& _gameDataPath[strlen(_gameDataPath)-1] != ':'
+#endif
+					&& _gameDataPath[strlen(_gameDataPath)-1] != '\\') {
 		char slashless[1024];	/* Append slash to path */
 		strcpy(slashless, _gameDataPath);
 		_gameDataPath = (char *)malloc((strlen(slashless) + 1) * sizeof(char));





More information about the Scummvm-git-logs mailing list