aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/access/amazon/amazon_game.cpp8
-rw-r--r--engines/access/amazon/amazon_game.h2
-rw-r--r--engines/access/room.cpp2
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index f633cd8753..14ee9bc947 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -253,7 +253,7 @@ void AmazonEngine::loadEstablish(int sub) {
}
}
-void AmazonEngine::doEstablish(int esatabIndex, int sub) {
+void AmazonEngine::doEstablish(int estabIndex, int sub) {
_establishMode = 1;
_screen->forceFadeOut();
@@ -275,9 +275,9 @@ void AmazonEngine::doEstablish(int esatabIndex, int sub) {
_screen->_maxChars = 37;
_screen->_printOrg = _screen->_printStart = Common::Point(48, 35);
- loadEstablish(sub);
- _et = sub;
- uint16 msgOffset = READ_LE_UINT16(_eseg->data() + (sub * 2) + 2);
+ loadEstablish(estabIndex);
+ _et = estabIndex;
+ uint16 msgOffset = READ_LE_UINT16(_eseg->data() + (estabIndex * 2) + 2);
_printEnd = 155;
if (_txtPages == 0) {
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 6511b377ae..575b3d14b7 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -100,7 +100,7 @@ private:
void setupGame();
void loadEstablish(int sub);
- void doEstablish(int esatabIndex, int sub);
+ void doEstablish(int estabIndex, int sub);
void establishCenter(int esatabIndex, int sub);
protected:
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 3696a4cadf..7df7ca9251 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -171,7 +171,7 @@ void Room::loadRoomData(const byte *roomData) {
_vm->_establishFlag = true;
if (_vm->_establishTable[roomInfo._estIndex] != 1) {
_vm->_establishTable[roomInfo._estIndex] = 1;
- _vm->establish(0, roomInfo._estIndex);
+ _vm->establish(roomInfo._estIndex, 0);
}
}