aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/kyra_v1.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2009-06-07 20:43:43 +0000
committerJohannes Schickel2009-06-07 20:43:43 +0000
commit5c233c447ba9656608b41fd0bd46edcc830e8b13 (patch)
treea7508b8ec523b7718a5641e5db24ce94c672e0d6 /engines/kyra/kyra_v1.cpp
parentc7861cb65e7bcddc8bb7e51a7df30f6419dcc105 (diff)
downloadscummvm-rg350-5c233c447ba9656608b41fd0bd46edcc830e8b13.tar.gz
scummvm-rg350-5c233c447ba9656608b41fd0bd46edcc830e8b13.tar.bz2
scummvm-rg350-5c233c447ba9656608b41fd0bd46edcc830e8b13.zip
Remove LoLEngine::_gameFlags and convert all Lands of Lore code to use _flagsTable instead.
svn-id: r41351
Diffstat (limited to 'engines/kyra/kyra_v1.cpp')
-rw-r--r--engines/kyra/kyra_v1.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp
index 71045e116d..d9fc8f9d66 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_v1.cpp
@@ -470,15 +470,18 @@ void KyraEngine_v1::resetSkipFlag(bool removeEvent) {
int KyraEngine_v1::setGameFlag(int flag) {
+ assert((flag >> 3) >= 0 && (flag >> 3) <= ARRAYSIZE(_flagsTable));
_flagsTable[flag >> 3] |= (1 << (flag & 7));
return 1;
}
int KyraEngine_v1::queryGameFlag(int flag) const {
+ assert((flag >> 3) >= 0 && (flag >> 3) <= ARRAYSIZE(_flagsTable));
return ((_flagsTable[flag >> 3] >> (flag & 7)) & 1);
}
int KyraEngine_v1::resetGameFlag(int flag) {
+ assert((flag >> 3) >= 0 && (flag >> 3) <= ARRAYSIZE(_flagsTable));
_flagsTable[flag >> 3] &= ~(1 << (flag & 7));
return 0;
}