diff options
| author | Max Horn | 2003-04-13 01:51:24 +0000 |
|---|---|---|
| committer | Max Horn | 2003-04-13 01:51:24 +0000 |
| commit | c7f298702aef6ddef2d13c146e1abed74c672859 (patch) | |
| tree | 772d76437923133ef8273e77f3fa930e053b7d59 | |
| parent | 06810ea1846a39d8b4a2c88a859abc48fae389bd (diff) | |
| download | scummvm-rg350-c7f298702aef6ddef2d13c146e1abed74c672859.tar.gz scummvm-rg350-c7f298702aef6ddef2d13c146e1abed74c672859.tar.bz2 scummvm-rg350-c7f298702aef6ddef2d13c146e1abed74c672859.zip | |
fixed my box size hack
svn-id: r6999
| -rw-r--r-- | scumm/scummvm.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 677f655349..b839b28017 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -881,14 +881,14 @@ void Scumm::initRoomSubBlocks() { if (!roomptr || !roomResPtr) error("Room %d: data not found (" __FILE__ ":%d)", _roomResource, __LINE__); + // + // Determine the room dimensions (width/height) + // if (_features & GF_OLD_BUNDLE) rmhd = (RoomHeader *)(roomptr + 4); else rmhd = (RoomHeader *)findResourceData(MKID('RMHD'), roomptr); - // - // Determine the room dimensions (width/height) - // if (_features & GF_AFTER_V8) { _scrWidth = READ_LE_UINT32(&(rmhd->v8.width)); _scrHeight = READ_LE_UINT32(&(rmhd->v8.height)); @@ -968,7 +968,7 @@ void Scumm::initRoomSubBlocks() { ptr += size; if (_features & GF_OLD_BUNDLE) // FIXME. This is an evil HACK!!! - size = (READ_LE_UINT16(roomptr + 0x15) - READ_LE_UINT16(roomptr + 0x0A)) - size; + size = (READ_LE_UINT16(roomptr + 0x0A) - READ_LE_UINT16(roomptr + 0x15)) - size; else size = getResourceDataSize(ptr - size - 6) - size; |