Ticket #9042: scummvm-sci-resource.patch

engines/sci/resource.cpp

@@ -864 +898 @@
                 debug("Patching %s failed - resource type mismatch", source->location_name.c_str());
                 return;
         }
+
+        // Fixes SQ5/German, patch file special case logic taken from SCI-View disassembly
+        if (patch_data_offset & 0x80) {
+                switch (patch_data_offset & 0x7F) {
+                        case 0: patch_data_offset = 24; break;
+                        case 1: patch_data_offset = 2; break;
+                        default:
+                                warning("Resource-patch unsupported special case %X\n", patch_data_offset);
+                }
+        }
+
         if (patch_data_offset + 2 >= fsize) {
                 debug("Patching %s failed - patch starting at offset %d can't be in file of size %d",
                       source->location_name.c_str(), patch_data_offset + 2, fsize);
@@ -974 +1019 @@
                         res->file_offset = offset & (((~bMask) << 24) | 0xFFFFFF);
                         res->id = resId;
                         res->source = getVolume(map, offset >> bShift);
+                        if (!res->source) {
+                                warning("Could not get volume for resource %d, VolumeID %d\n", resId, offset >> bShift);
+                        }
                         _resMap.setVal(resId, res);
                 }
         } while (!file.eos());