diff options
| author | Paul Gilbert | 2014-08-09 18:28:33 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2014-08-09 18:28:33 -0400 |
| commit | 127a0eeadd16719e212c19d7938158d75f51568e (patch) | |
| tree | 74e5ffc73e7c4daf9da6cbe2d8a91082878a91f0 /engines/access/amazon | |
| parent | d04a6d2d7a9bfc3bcfd3ad94c48f878d1143ee32 (diff) | |
| download | scummvm-rg350-127a0eeadd16719e212c19d7938158d75f51568e.tar.gz scummvm-rg350-127a0eeadd16719e212c19d7938158d75f51568e.tar.bz2 scummvm-rg350-127a0eeadd16719e212c19d7938158d75f51568e.zip | |
ACCESS: Cleanup of Amazon game flags
Diffstat (limited to 'engines/access/amazon')
| -rw-r--r-- | engines/access/amazon/amazon_game.cpp | 8 | ||||
| -rw-r--r-- | engines/access/amazon/amazon_game.h | 15 |
2 files changed, 21 insertions, 2 deletions
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp index 8267c8549a..9c516168de 100644 --- a/engines/access/amazon/amazon_game.cpp +++ b/engines/access/amazon/amazon_game.cpp @@ -31,7 +31,12 @@ namespace Access { namespace Amazon { AmazonEngine::AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc) : - AccessEngine(syst, gameDesc) { + AccessEngine(syst, gameDesc), + _guardLocation(_flags[122]), _guardFind(_flags[128]), _helpLevel(_flags[167]), + _jasMayaFlag(_flags[168]), _moreHelp(_flags[169]), _flashbackFlag(_flags[171]), + _riverFlag(_flags[185]), _aniOutFlag(_flags[195]), _badEnd(_flags[218]), + _noHints(_flags[219]), _aniFlag(_flags[229]), _allenFlag(_flags[237]), + _noSound(_flags[239]) { _skipStart = false; _canoeLane = 0; @@ -47,7 +52,6 @@ AmazonEngine::AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc) _rawInactiveY = 0; _inactiveYOff = 0; Common::fill(&_esTabTable[0], &_esTabTable[100], 0); - _flags.resize(122); } AmazonEngine::~AmazonEngine() { diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h index b998b1de83..c927ad90d7 100644 --- a/engines/access/amazon/amazon_game.h +++ b/engines/access/amazon/amazon_game.h @@ -48,6 +48,21 @@ private: int _inactiveYOff; int _esTabTable[100]; + // Fields that are mapped to flags + int &_guardLocation; + int &_guardFind; + int &_helpLevel; + int &_jasMayaFlag; + int &_moreHelp; + int &_flashbackFlag; + int &_riverFlag; + int &_aniOutFlag; + int &_badEnd; + int &_noHints; + int &_aniFlag; + int &_allenFlag; + int &_noSound; + /** * Do the game introduction */ |