aboutsummaryrefslogtreecommitdiff
path: root/engines/access/amazon/amazon_room.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/access/amazon/amazon_room.cpp')
-rw-r--r--engines/access/amazon/amazon_room.cpp9
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