aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2015-01-04 21:38:37 +0100
committerStrangerke2015-01-04 21:38:37 +0100
commitfa07048bc4be0339b45d650873643f941aee96b2 (patch)
tree26a3b64f69966a2161360522990481c738e6a920
parent7e45ce9096eb86309e22ec0db966621f9d3b830c (diff)
downloadscummvm-rg350-fa07048bc4be0339b45d650873643f941aee96b2.tar.gz
scummvm-rg350-fa07048bc4be0339b45d650873643f941aee96b2.tar.bz2
scummvm-rg350-fa07048bc4be0339b45d650873643f941aee96b2.zip
ACCESS: Improve the use of _establishTable as a boolean
-rw-r--r--engines/access/room.cpp4
-rw-r--r--engines/access/scripts.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index f10ba86a40..fa0c0c4510 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -199,8 +199,8 @@ void Room::loadRoomData(const byte *roomData) {
_vm->_establishFlag = false;
if (roomInfo._estIndex != -1) {
_vm->_establishFlag = true;
- if (_vm->_establishTable[roomInfo._estIndex] != 1) {
- _vm->_establishTable[roomInfo._estIndex] = 1;
+ if (!_vm->_establishTable[roomInfo._estIndex]) {
+ _vm->_establishTable[roomInfo._estIndex] = true;
_vm->establish(0, roomInfo._estIndex);
}
}
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 0188457a5a..a74cc7b12e 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -572,7 +572,7 @@ void Scripts::cmdSpecial() {
int p2 = _data->readUint16LE();
if (_specialFunction == 1) {
- if (_vm->_establishTable[p2] == 1)
+ if (_vm->_establishTable[p2])
return;
_vm->_screen->savePalette();