From 5c233c447ba9656608b41fd0bd46edcc830e8b13 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Sun, 7 Jun 2009 20:43:43 +0000 Subject: Remove LoLEngine::_gameFlags and convert all Lands of Lore code to use _flagsTable instead. svn-id: r41351 --- engines/kyra/kyra_v1.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'engines/kyra/kyra_v1.cpp') 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; } -- cgit v1.2.3