[Scummvm-cvs-logs] scummvm master -> 23ace32e09f4673b5741f34adeb869c65169f3c6
wjp
wjp at usecode.org
Fri Dec 25 11:32:22 CET 2015
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
23ace32e09 LAB: Simplify tab handling
Commit: 23ace32e09f4673b5741f34adeb869c65169f3c6
https://github.com/scummvm/scummvm/commit/23ace32e09f4673b5741f34adeb869c65169f3c6
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2015-12-25T11:20:03+01:00
Commit Message:
LAB: Simplify tab handling
Changed paths:
engines/lab/engine.cpp
engines/lab/processroom.cpp
diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp
index a01df7e..c46910c 100644
--- a/engines/lab/engine.cpp
+++ b/engines/lab/engine.cpp
@@ -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)));
}
diff --git a/engines/lab/processroom.cpp b/engines/lab/processroom.cpp
index c096c75..1a9e7a8 100644
--- a/engines/lab/processroom.cpp
+++ b/engines/lab/processroom.cpp
@@ -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) {
More information about the Scummvm-git-logs
mailing list