[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.431,2.432
Max Horn
fingolfin at users.sourceforge.net
Fri Oct 10 06:56:08 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv26276/scumm
Modified Files:
scummvm.cpp
Log Message:
some cleanup
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.431
retrieving revision 2.432
diff -u -d -r2.431 -r2.432
--- scummvm.cpp 9 Oct 2003 14:20:20 -0000 2.431
+++ scummvm.cpp 10 Oct 2003 13:55:07 -0000 2.432
@@ -2507,7 +2507,7 @@
const char *ScummEngine::getGameDataPath() const {
#ifdef MACOSX
- if (_version == 8 && !memcmp(_gameDataPath, "/Volumes/MONKEY3_", 17)) {
+ if (_version == 8 && _gameDataPath == "/Volumes/MONKEY3_") {
// Special case for COMI on Mac OS X. The mount points on OS X depend
// on the volume name. Hence if playing from CD, we'd get a problem.
// So if loading of a resource file fails, we fall back to the (fixed)
@@ -2531,7 +2531,7 @@
}
#endif
- return _gameDataPath;
+ return _gameDataPath.c_str();
}
void ScummEngine::errorString(const char *buf1, char *buf2) {
More information about the Scummvm-git-logs
mailing list