thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

arrgh (revert)

Browse source 
svn-id: r7058
This commit is contained in:
Paweł Kołodziejski 2003-04-21 13:19:19 +00:00
parent 48ad5199ff
commit 4a831b1206
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scumm/scummvm.cpp
View file

@ -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