From eed5116fef9aee79c879c567aecf39d5285ea19d Mon Sep 17 00:00:00 2001 From: Strangerke Date: Wed, 21 Jan 2015 22:26:23 +0100 Subject: [PATCH] ACCESS: MM - Fix the travel box --- engines/access/bubble_box.cpp | 2 +- engines/access/scripts.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/engines/access/bubble_box.cpp b/engines/access/bubble_box.cpp index da3ae66713b..0fb39c91956 100644 --- a/engines/access/bubble_box.cpp +++ b/engines/access/bubble_box.cpp @@ -649,7 +649,7 @@ int BubbleBox::doBox_v1(int item, int box, int &btnSelected) { if (!_vm->_events->_leftButton) continue; - if ((_type != TYPE_1) && (_vm->_timers[2]._flag == 0)) { + if (((_type == TYPE_1) || (_type != TYPE_3)) && (_vm->_timers[2]._flag == 0)) { ++_vm->_timers[2]._flag; if (_btnUpPos.contains(_vm->_events->_mousePos)) { if (_vm->BCNT) { diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp index cc8eb61012d..60791bbb2f9 100644 --- a/engines/access/scripts.cpp +++ b/engines/access/scripts.cpp @@ -685,6 +685,8 @@ void Scripts::cmdDoTravel() { continue; } if (_vm->_player->_roomNumber != idx) { + _vm->_player->_roomNumber = idx; + _vm->_room->_function = FN_CLEAR1; if (Martian::TRAVEL_POS[idx][0] == -1) { _vm->_player->_roomNumber = idx; _vm->_room->_conFlag = true;