Ticket #2716: indy3towns.diff

engines/scumm/resource_v4.cpp

@@ -47 +47 @@
                 if (_fileHandle->ioFailed())
                         break;
 
+                printf("File pos %d ID %c%c\n", _fileHandle->pos(), blocktype & 0xFF, blocktype >> 8);
                 switch (blocktype) {
                 case 0x4E52:    // 'NR'
                         _fileHandle->readUint16LE();
@@ -65 +66 @@
                         break;
                 case 0x4F30:    // 'O0'
                         _numGlobalObjects = _fileHandle->readUint16LE();
+
+                        if (_game.id == GID_INDY3 && _game.platform == Common::kPlatformFMTowns)
+                                itemsize += 32;
                         break;
                 }
                 _fileHandle->seek(itemsize - 8, SEEK_CUR);
@@ -121 +125 @@
                         break;
 
                 default:
-                        // FIXME: this is a little hack because Indy3 FM-TOWNS has
-                        // 32 extra bytes of unknown meaning appended to 00.LFL
-                        if (!(_game.id == GID_INDY3 && _game.platform == Common::kPlatformFMTowns))
-                                error("Bad ID %c%c found in directory!", blocktype & 0xFF, blocktype >> 8);
-                        return;
+                        error("Bad ID %c%c found in directory!", blocktype & 0xFF, blocktype >> 8);
                 }
         }
         closeRoom();
@@ -188 +188 @@
                 _objectOwnerTable[i] = tmp & OF_OWNER_MASK;
                 _objectStateTable[i] = tmp >> OF_STATE_SHL;
         }
+
+        // FIXME: Indy3 FM-TOWNS has 32 extra bytes of unknown meaning
+        // appended to 00.LFL
+        if (_game.id == GID_INDY3 && _game.platform == Common::kPlatformFMTowns)
+                _fileHandle->seek(32, SEEK_CUR);
 }