aboutsummaryrefslogtreecommitdiff
path: root/scummvm.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'scummvm.cpp')
-rw-r--r--scummvm.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/scummvm.cpp b/scummvm.cpp
index 2c4f5dca3d..4dabc1523d 100644
--- a/scummvm.cpp
+++ b/scummvm.cpp
@@ -681,8 +681,15 @@ void Scumm::initRoomSubBlocks() {
roomptr = getResourceAddress(rtRoom, _roomResource);
rmhd = (RoomHeader*)findResourceData(MKID('RMHD'), roomptr);
- _scrWidth = READ_LE_UINT16(&rmhd->width);
- _scrHeight = READ_LE_UINT16(&rmhd->height);
+
+ if(_features & GF_AFTER_V7) {
+ _scrWidth = READ_LE_UINT16(&(rmhd->v7.width));
+ _scrHeight = READ_LE_UINT16(&(rmhd->v7.height));
+ } else {
+ _scrWidth = READ_LE_UINT16(&(rmhd->old.width));
+ _scrHeight = READ_LE_UINT16(&(rmhd->old.height));
+ }
+
if( _features & GF_SMALL_HEADER)
_IM00_offs = findResourceData(MKID('IM00'), roomptr) - roomptr;