diff options
| author | Paul Gilbert | 2014-11-23 16:15:07 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2014-12-12 22:39:42 -0500 |
| commit | a0beb08984b989d6dcb1c9dcbc8bb083e2534891 (patch) | |
| tree | 664b14ca731ad4f51d873243efde314c8e5d4032 /engines/access/amazon/amazon_room.cpp | |
| parent | 1cbaab55cd6870c9f75162f1ddb90f0c25959db3 (diff) | |
| download | scummvm-rg350-a0beb08984b989d6dcb1c9dcbc8bb083e2534891.tar.gz scummvm-rg350-a0beb08984b989d6dcb1c9dcbc8bb083e2534891.tar.bz2 scummvm-rg350-a0beb08984b989d6dcb1c9dcbc8bb083e2534891.zip | |
ACCESS: Refactor _inactive from AccessEngine to AmazonEngine
Diffstat (limited to 'engines/access/amazon/amazon_room.cpp')
| -rw-r--r-- | engines/access/amazon/amazon_room.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp index db46b4836c..262a6caa87 100644 --- a/engines/access/amazon/amazon_room.cpp +++ b/engines/access/amazon/amazon_room.cpp @@ -78,7 +78,7 @@ void AmazonRoom::reloadRoom1() { if (_vm->_player->_roomNumber == 29 || _vm->_player->_roomNumber == 31 || _vm->_player->_roomNumber == 42 || _vm->_player->_roomNumber == 44) { Resource *spriteData = _vm->_files->loadFile("MAYA.LZ"); - _vm->_inactive._spritesPtr = new SpriteResource(_vm, spriteData); + _game->_inactive._spritesPtr = new SpriteResource(_vm, spriteData); delete spriteData; _vm->_currentCharFlag = false; } @@ -168,9 +168,11 @@ void AmazonRoom::mainAreaClick() { _vm->_player->_roomNumber == 31 || _vm->_player->_roomNumber == 29) { switch (checkBoxes1(pt)) { case 0: + // Make Jason the active player _game->_jasMayaFlag = 0; return; case 1: + // Make Maya the active player _game->_jasMayaFlag = 1; return; default: @@ -208,6 +210,11 @@ void AmazonRoom::init4Quads() { _vm->_screen->clearScreen(); } +void AmazonRoom::clearRoom() { + Room::clearRoom(); + _game->freeInactivePlayer(); +} + } // End of namespace Amazon } // End of namespace Access |