aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mac/mac.cpp2
-rw-r--r--scummvm.cpp14
2 files changed, 9 insertions, 7 deletions
diff --git a/mac/mac.cpp b/mac/mac.cpp
index d727e118a5..d9d72098b2 100644
--- a/mac/mac.cpp
+++ b/mac/mac.cpp
@@ -959,8 +959,6 @@ void main(void)
sound.initialize(&scumm,&snd_driv);
- scumm._gui = &gui;
-
scumm.scummMain(2, &gameTitle);
setWindowName(wm->_scumm);
diff --git a/scummvm.cpp b/scummvm.cpp
index 8e61d41f94..1f3577d3b0 100644
--- a/scummvm.cpp
+++ b/scummvm.cpp
@@ -557,12 +557,12 @@ NextArg:;
_exe_name = s;
}
}
- #else
- //sprintf(_gameDataPath, ":%s:", *argv);
- //_gameDataPath = *argv;
+ #else
_midi_driver = 4;
_exe_name = *argv;
+ _gameDataPath = (char*)malloc(strlen(_exe_name) + 3);
+ sprintf(_gameDataPath, ":%s:", _exe_name);
#endif
}
@@ -1012,9 +1012,13 @@ void Scumm::dumpResource(char *tag, int idx, byte *ptr) {
size = READ_LE_UINT32(ptr);
else
size = READ_BE_UINT32_UNALIGNED(ptr+4);
-
+
+ #if defined(__APPLE__CW)
+ sprintf(buf, ":dumps:%s%d.dmp", tag,idx);
+ #else
sprintf(buf, "dumps/%s%d.dmp", tag,idx);
-
+ #endif
+
out = fopen(buf,"rb");
if (!out) {
out = fopen(buf, "wb");