aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2003-06-05 10:33:13 +0000
committerMax Horn2003-06-05 10:33:13 +0000
commit740e7cc0ff523ec4d238f6872f8c96e3cb9a1bc5 (patch)
tree19741f40d5b3fd71f8a201458580db84759b5ceb
parenta61e8453132d8f6c16c66ee89c1cfa95cd1f5ecf (diff)
downloadscummvm-rg350-740e7cc0ff523ec4d238f6872f8c96e3cb9a1bc5.tar.gz
scummvm-rg350-740e7cc0ff523ec4d238f6872f8c96e3cb9a1bc5.tar.bz2
scummvm-rg350-740e7cc0ff523ec4d238f6872f8c96e3cb9a1bc5.zip
restricted check to V2, stupid mistake
svn-id: r8323
-rw-r--r--scumm/saveload.cpp2
-rw-r--r--scumm/scummvm.cpp3
2 files changed, 3 insertions, 2 deletions
diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp
index f48a8f7d9a..f4f58878e4 100644
--- a/scumm/saveload.cpp
+++ b/scumm/saveload.cpp
@@ -182,7 +182,7 @@ bool Scumm::loadState(int slot, bool compat, SaveFileManager *mgr) {
initBGBuffers(_roomHeight);
- if (_features & GF_OLD_BUNDLE) {
+ if (_features & GF_AFTER_V2) {
// Regenerate strip table when loading
_roomStrips = gdi.generateStripTable(getResourceAddress(rtRoom, _roomResource) + _IM00_offs,
_roomWidth, _roomHeight, _roomStrips);
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index b07f6fc2ea..079605b58d 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -1413,7 +1413,8 @@ void Scumm::initRoomSubBlocks() {
//
if (_features & GF_OLD_BUNDLE) {
_IM00_offs = READ_LE_UINT16(roomptr + 0x0A);
- _roomStrips = gdi.generateStripTable(roomptr + _IM00_offs, _roomWidth, _roomHeight, _roomStrips);
+ if (_features & GF_AFTER_V2)
+ _roomStrips = gdi.generateStripTable(roomptr + _IM00_offs, _roomWidth, _roomHeight, _roomStrips);
} else if (_features & GF_SMALL_HEADER)
_IM00_offs = findResourceData(MKID('IM00'), roomptr) - roomptr;
else if (_features & GF_AFTER_V8) {