aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2003-10-10 13:55:08 +0000
committerMax Horn2003-10-10 13:55:08 +0000
commit5301edc38306c27143f38d74085e6c095688f6aa (patch)
tree101c5188d06ac1f476edae9f3a5755e48554dc64 /scumm
parent1f9497cb1fbfcc8c3ffd412ce450144983b2452d (diff)
downloadscummvm-rg350-5301edc38306c27143f38d74085e6c095688f6aa.tar.gz
scummvm-rg350-5301edc38306c27143f38d74085e6c095688f6aa.tar.bz2
scummvm-rg350-5301edc38306c27143f38d74085e6c095688f6aa.zip
some cleanup
svn-id: r10720
Diffstat (limited to 'scumm')
-rw-r--r--scumm/scummvm.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 07f7340f8d..94f79c615a 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -2507,7 +2507,7 @@ byte *ScummEngine::get2byteCharPtr(int idx) {
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 @@ const char *ScummEngine::getGameDataPath() const {
}
#endif
- return _gameDataPath;
+ return _gameDataPath.c_str();
}
void ScummEngine::errorString(const char *buf1, char *buf2) {