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

LAB: Simplify tab handling

Browse source
This commit is contained in:
Willem Jan Palenstijn 2015-12-25 11:18:22 +01:00
parent 3740560153
commit 23ace32e09
2 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
engines/lab/engine.cpp
View file

@ -616,18 +616,7 @@ bool LabEngine::fromCrumbs(uint32 tmpClass, uint16 code, uint16 qualifier, Commo
// get next close-up in list after the one pointed to by curPos
setCurrentClose(curPos, &tmpClosePtr, true, true);
if (tmpClosePtr == _closeDataPtr) {
tmpClosePtr = nullptr;
if (!_closeDataPtr) {
ViewData *vptr = getViewData(_roomNum, _direction);
if (!vptr->_closeUps.empty())
tmpClosePtr = &(*vptr->_closeUps.begin());
} else {
if (!_closeDataPtr->_subCloseUps.empty())
tmpClosePtr = &(*_closeDataPtr->_subCloseUps.begin());
}
}
if (tmpClosePtr)
if (tmpClosePtr != _closeDataPtr)
_event->setMousePos(Common::Point(_utils->scaleX((tmpClosePtr->_x1 + tmpClosePtr->_x2) / 2), _utils->scaleY((tmpClosePtr->_y1 + tmpClosePtr->_y2) / 2)));
}

7
engines/lab/processroom.cpp
View file

@ -202,6 +202,13 @@ void LabEngine::setCurrentClose(Common::Point pos, CloseDataPtr *closePtrList, b
return;
}
}
// If we got here, no match was found. If we want the "next" close-up,
// return the first one in the list, if any.
if (next) {
if (!list->empty())
*closePtrList = &(*list->begin());
}
}
bool LabEngine::takeItem(Common::Point pos, CloseDataPtr *closePtrList) {