diff options
| author | Paweł Kołodziejski | 2003-04-21 13:19:19 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2003-04-21 13:19:19 +0000 |
| commit | 4a831b1206b60319f0b15df84c4963a0e58a7efc (patch) | |
| tree | 5fd2f961fb92d67d060ce08b216871588133101a /scumm/scummvm.cpp | |
| parent | 48ad5199ff89e27bc525aa3f70d61749b48dbb2a (diff) | |
| download | scummvm-rg350-4a831b1206b60319f0b15df84c4963a0e58a7efc.tar.gz scummvm-rg350-4a831b1206b60319f0b15df84c4963a0e58a7efc.tar.bz2 scummvm-rg350-4a831b1206b60319f0b15df84c4963a0e58a7efc.zip | |
arrgh (revert)
svn-id: r7058
Diffstat (limited to 'scumm/scummvm.cpp')
| -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 e93f188bf4..3de3ab4271 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -928,7 +928,7 @@ void Scumm::initRoomSubBlocks() { // if (_features & GF_AFTER_V2) _EXCD_offs = READ_LE_UINT16(roomptr + 0x18); - else if (_features & GF_AFTER_V3) + else if (_features & GF_OLD_BUNDLE) _EXCD_offs = READ_LE_UINT16(roomptr + 0x19); else { ptr = findResourceData(MKID('EXCD'), roomResPtr); @@ -943,7 +943,7 @@ void Scumm::initRoomSubBlocks() { // if (_features & GF_AFTER_V2) _ENCD_offs = READ_LE_UINT16(roomptr + 0x1C); - else if (_features & GF_AFTER_V3) + else if (_features & GF_OLD_BUNDLE) _ENCD_offs = READ_LE_UINT16(roomptr + 0x1B); else { ptr = findResourceData(MKID('ENCD'), roomResPtr); @@ -959,7 +959,7 @@ void Scumm::initRoomSubBlocks() { if (_features & GF_SMALL_HEADER) { if (_features & GF_AFTER_V2) ptr = roomptr + *(roomptr + 0x15); - else if (_features & GF_AFTER_V3) + else if (_features & GF_OLD_BUNDLE) ptr = roomptr + READ_LE_UINT16(roomptr + 0x15); else ptr = findResourceData(MKID('BOXD'), roomptr); @@ -976,7 +976,7 @@ void Scumm::initRoomSubBlocks() { ptr += size; if (_features & GF_AFTER_V2) size = (READ_LE_UINT16(roomptr + 0x0A) - *(roomptr + 0x15)) - size; - else if (_features & GF_AFTER_V3) + else if (_features & GF_OLD_BUNDLE) // FIXME. This is an evil HACK!!! size = (READ_LE_UINT16(roomptr + 0x0A) - READ_LE_UINT16(roomptr + 0x15)) - size; else |