aboutsummaryrefslogtreecommitdiff
path: root/engines/simon/vga.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2006-04-05 00:37:42 +0000
committerTorbjörn Andersson2006-04-05 00:37:42 +0000
commit7bcd0ba4dccf5f100512721531035f3fc958bae8 (patch)
treeffc3369a087dff01acb7aa3c75659d34456c55c9 /engines/simon/vga.cpp
parentab49a043310d9ef49729d6ab66a5e604380a761f (diff)
downloadscummvm-rg350-7bcd0ba4dccf5f100512721531035f3fc958bae8.tar.gz
scummvm-rg350-7bcd0ba4dccf5f100512721531035f3fc958bae8.tar.bz2
scummvm-rg350-7bcd0ba4dccf5f100512721531035f3fc958bae8.zip
Use the setBitFlag() and getBitFlag() functions, instead of manipulating
_bitArray[] directly. This kind of change is, of course, rather error-prone. I hope I haven't introduced any regressions. svn-id: r21622
Diffstat (limited to 'engines/simon/vga.cpp')
-rw-r--r--engines/simon/vga.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/simon/vga.cpp b/engines/simon/vga.cpp
index e026223b17..131373a372 100644
--- a/engines/simon/vga.cpp
+++ b/engines/simon/vga.cpp
@@ -1251,7 +1251,7 @@ void SimonEngine::drawImages(VC10_state *state) {
}
/* vc10_helper_4 */
} else {
- if (getGameType() == GType_SIMON2 && state->flags & kDFUseFrontBuf && _bitArray[10] & 0x800) {
+ if (getGameType() == GType_SIMON2 && state->flags & kDFUseFrontBuf && getBitFlag(171)) {
state->surf_addr = state->surf2_addr;
state->surf_pitch = state->surf2_pitch;
}
@@ -1704,7 +1704,7 @@ void SimonEngine::vc40() {
uint var = vcReadNextWord();
int16 value = vcReadVar(var) + vcReadNextWord();
- if ((getGameType() == GType_SIMON2) && var == 15 && !(_bitArray[5] & 1)) {
+ if ((getGameType() == GType_SIMON2) && var == 15 && !getBitFlag(80)) {
int16 tmp;
if (_scrollCount != 0) {
@@ -1733,7 +1733,7 @@ void SimonEngine::vc41() {
uint var = vcReadNextWord();
int16 value = vcReadVar(var) - vcReadNextWord();
- if ((getGameType() == GType_SIMON2) && var == 15 && !(_bitArray[5] & 1)) {
+ if ((getGameType() == GType_SIMON2) && var == 15 && !getBitFlag(80)) {
int16 tmp;
if (_scrollCount != 0) {