aboutsummaryrefslogtreecommitdiff
path: root/engines/access/room.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2014-08-16 11:58:59 -0400
committerPaul Gilbert2014-08-16 11:58:59 -0400
commit5ff004b2d839a4e3a06112916efe0412a5112903 (patch)
treed04a09f64ba9016c44f29062fedab815626edb15 /engines/access/room.cpp
parentdc5500e2464d3457d9dee70993ecd4340963946e (diff)
downloadscummvm-rg350-5ff004b2d839a4e3a06112916efe0412a5112903.tar.gz
scummvm-rg350-5ff004b2d839a4e3a06112916efe0412a5112903.tar.bz2
scummvm-rg350-5ff004b2d839a4e3a06112916efe0412a5112903.zip
ACCESS: Fix initialisation of player positioning and scaling values
Diffstat (limited to 'engines/access/room.cpp')
-rw-r--r--engines/access/room.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index cf8da17f05..ccd19b0ed9 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -182,14 +182,14 @@ void Room::loadRoomData(const byte *roomData) {
_vm->_scaleH1 = roomInfo._scaleH1;
_vm->_scaleH2 = roomInfo._scaleH2;
_vm->_scaleN1 = roomInfo._scaleN1;
- _vm->_scaleT1 = ((_vm->_scaleH2 - _vm->_scaleH1) << 8) / _vm->_scaleN1;
+ _vm->_scaleT1 = ((_vm->_scaleH1 - _vm->_scaleH2) << 8) / _vm->_scaleN1;
if (roomInfo._playFieldFile._fileNum != -1) {
loadPlayField(roomInfo._playFieldFile._fileNum,
roomInfo._playFieldFile._subfile);
setupRoom();
- _vm->_scaleMaxY = _vm->_playFieldHeight << 4;
+ _vm->_scaleMaxY = _playFieldHeight << 4;
}
// Load cells
@@ -211,7 +211,8 @@ void Room::loadRoomData(const byte *roomData) {
_vm->_animation->loadAnimations(data, _vm->_files->_filesize);
}
- _vm->_scaleI = roomInfo._scaleI;
+ _vm->_scale = _vm->_scaleI = roomInfo._scaleI;
+ _vm->_screen->setScaleTable(_vm->_scale);
_vm->_player->_scrollThreshold = roomInfo._scrollThreshold;
// Handle loading scene palette data