diff options
| author | Strangerke | 2015-01-21 22:26:23 +0100 |
|---|---|---|
| committer | Strangerke | 2015-01-21 22:26:23 +0100 |
| commit | eed5116fef9aee79c879c567aecf39d5285ea19d (patch) | |
| tree | 68d7c70312bd544cd3975d6686919ae2f3da3533 /engines/access | |
| parent | 290ea5dfa272a8139440db8aca4839c35e759bae (diff) | |
| download | scummvm-rg350-eed5116fef9aee79c879c567aecf39d5285ea19d.tar.gz scummvm-rg350-eed5116fef9aee79c879c567aecf39d5285ea19d.tar.bz2 scummvm-rg350-eed5116fef9aee79c879c567aecf39d5285ea19d.zip | |
ACCESS: MM - Fix the travel box
Diffstat (limited to 'engines/access')
| -rw-r--r-- | engines/access/bubble_box.cpp | 2 | ||||
| -rw-r--r-- | engines/access/scripts.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/engines/access/bubble_box.cpp b/engines/access/bubble_box.cpp index da3ae66713..0fb39c9195 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 cc8eb61012..60791bbb2f 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; |