aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorStrangerke2014-12-03 20:30:21 +0100
committerPaul Gilbert2014-12-12 22:58:12 -0500
commitc6322702e692948933056b889820c84b8af842c5 (patch)
tree373745b7eaf23fd106014da7f0b810b31b9f85e6 /engines
parent2413fd0798b3eb0bd89b51a03dea432b40311bfd (diff)
downloadscummvm-rg350-c6322702e692948933056b889820c84b8af842c5.tar.gz
scummvm-rg350-c6322702e692948933056b889820c84b8af842c5.tar.bz2
scummvm-rg350-c6322702e692948933056b889820c84b8af842c5.zip
ACCESS: Fix doEstablish for the floppy and for the demo versions
Diffstat (limited to 'engines')
-rw-r--r--engines/access/amazon/amazon_game.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 5b27eb24a2..29197fe93c 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -142,7 +142,10 @@ void AmazonEngine::setupGame() {
void AmazonEngine::initVariables() {
_chapter = 1;
// Set player room and position
- _player->_roomNumber = 4;
+ if (isDemo())
+ _player->_roomNumber = 33;
+ else
+ _player->_roomNumber = 4;
_player->_playerX = _player->_rawPlayer.x = TRAVEL_POS[_player->_roomNumber][0];
_player->_playerY = _player->_rawPlayer.y = TRAVEL_POS[_player->_roomNumber][1];
}
@@ -212,7 +215,11 @@ void AmazonEngine::doEstablish(int screenId, int estabIndex) {
_screen->_printOrg = _screen->_printStart = Common::Point(48, 35);
loadEstablish(estabIndex);
_et = estabIndex;
- uint16 msgOffset = READ_LE_UINT16(_establish->data() + (estabIndex * 2) + 2);
+ uint16 msgOffset;
+ if (!isCD())
+ msgOffset = READ_LE_UINT16(_establish->data() + (estabIndex * 2));
+ else
+ msgOffset = READ_LE_UINT16(_establish->data() + (estabIndex * 2) + 2);
_printEnd = 155;
Common::String msg((const char *)_establish->data() + msgOffset);