Ticket #9112: scumm_mac_resfork.diff

resource_he.cpp

@@ -38 +38 @@
 #include "common/stream.h"
 #include "common/system.h"
 
+#ifdef MACOSX
+#include "common/config-manager.h"
+#include "backends/fs/stdiostream.h"
+#endif
+
 namespace Scumm {
 
 #define LE16(x)      ((x) = TO_LE_16(x))
@@ -1151 +1156 @@
         Common::File in;
         int size;
 
+#ifdef MACOSX
+        if (_fileName.empty())
+                _fileName = _vm->generateFilename(-3) + "/..namedfork/rsrc";
+
+        // HACK: Open the resource fork using the path and directly through StdioStream
+        if (!in.open(StdioStream::makeFromPath(ConfMan.get("path") + "/" + _fileName, false), _fileName))
+                error("Could not open resource fork: %s", _fileName.c_str());
+#else
         if (_fileName.empty()) { // We are running for the first time
                 _fileName = _vm->generateFilename(-3);
 
@@ -1172 +1185 @@
                 }
         } else
                 in.open(_fileName);
+#endif
 
         if (!in.isOpen()) {
                 error("Cannot open file %s", _fileName.c_str());
@@ -1181 +1195 @@
         if (_resOffset == -1) {
                 if (!init(in))
                         error("Resource fork is missing in file '%s'", _fileName.c_str());
-                in.close();
-                in.open(_fileName);
         }
 
         *buf = getResource(in, "crsr", 1000 + id, &size);