thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ACCESS: MM - Fix the travel box

Browse source
This commit is contained in:
Strangerke 2015-01-21 22:26:23 +01:00
parent 290ea5dfa2
commit eed5116fef
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/access/bubble_box.cpp
View file

@ -649,7 +649,7 @@ int BubbleBox::doBox_v1(int item, int box, int &btnSelected) {
if (!_vm->_events->_leftButton) if (!_vm->_events->_leftButton)
continue; 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; ++_vm->_timers[2]._flag;
if (_btnUpPos.contains(_vm->_events->_mousePos)) { if (_btnUpPos.contains(_vm->_events->_mousePos)) {
if (_vm->BCNT) { if (_vm->BCNT) {

2
engines/access/scripts.cpp
View file

@ -685,6 +685,8 @@ void Scripts::cmdDoTravel() {
continue; continue;
} }
if (_vm->_player->_roomNumber != idx) { if (_vm->_player->_roomNumber != idx) {
_vm->_player->_roomNumber = idx;
_vm->_room->_function = FN_CLEAR1;
if (Martian::TRAVEL_POS[idx][0] == -1) { if (Martian::TRAVEL_POS[idx][0] == -1) {
_vm->_player->_roomNumber = idx; _vm->_player->_roomNumber = idx;
_vm->_room->_conFlag = true; _vm->_room->_conFlag = true;