[Scummvm-cvs-logs] SF.net SVN: scummvm: [23373] scummvm/branches/branch-0-9-0/engines/scumm/resource_v4.cpp

kirben at users.sourceforge.net kirben at users.sourceforge.net
Thu Jul 6 00:28:48 CEST 2006


Revision: 23373
Author:   kirben
Date:     2006-07-05 15:28:43 -0700 (Wed, 05 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23373&view=rev

Log Message:
-----------
Fix bug #1515345 - INDY3 (FM-TOWNS): Black screen upon start (Amiga)

Modified Paths:
--------------
    scummvm/branches/branch-0-9-0/engines/scumm/resource_v4.cpp
Modified: scummvm/branches/branch-0-9-0/engines/scumm/resource_v4.cpp
===================================================================
--- scummvm/branches/branch-0-9-0/engines/scumm/resource_v4.cpp	2006-07-05 22:27:11 UTC (rev 23372)
+++ scummvm/branches/branch-0-9-0/engines/scumm/resource_v4.cpp	2006-07-05 22:28:43 UTC (rev 23373)
@@ -65,6 +65,10 @@
 			break;
 		case 0x4F30:	// 'O0'
 			_numGlobalObjects = _fileHandle->readUint16LE();
+
+			// Indy3 FM-TOWNS has 32 extra bytes of unknown meaning
+			if (_game.id == GID_INDY3 && _game.platform == Common::kPlatformFMTowns)
+				itemsize += 32;
 			break;
 		}
 		_fileHandle->seek(itemsize - 8, SEEK_CUR);
@@ -121,11 +125,7 @@
 			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,6 +188,10 @@
 		_objectOwnerTable[i] = tmp & OF_OWNER_MASK;
 		_objectStateTable[i] = tmp >> OF_STATE_SHL;
 	}
+
+	// FIXME: Indy3 FM-TOWNS has 32 extra bytes of unknown meaning
+	if (_game.id == GID_INDY3 && _game.platform == Common::kPlatformFMTowns)
+		_fileHandle->seek(32, SEEK_CUR);
 }
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Scummvm-git-logs mailing list