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

LAB: Use rectScale in two other places

Browse source
This commit is contained in:
Strangerke 2015-12-20 16:30:08 +01:00 • committed by Willem Jan Palenstijn
parent 6981d750ea
commit feeaf09486
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/lab/processroom.cpp
View file

@ -199,7 +199,7 @@ void LabEngine::setCurrentClose(Common::Point pos, CloseDataPtr *closePtrList, b
if (!useAbsoluteCoords)
target = Common::Rect(closePtr->_x1, closePtr->_y1, closePtr->_x2, closePtr->_y2);
else
target = Common::Rect(_utils->scaleX(closePtr->_x1), _utils->scaleY(closePtr->_y1), _utils->scaleX(closePtr->_x2), _utils->scaleY(closePtr->_y2));
target = _utils->rectScale(closePtr->_x1, closePtr->_y1, closePtr->_x2, closePtr->_y2);
if (target.contains(pos) && closePtr->_graphicName != "") {
*closePtrList = closePtr;
@ -223,7 +223,7 @@ bool LabEngine::takeItem(Common::Point pos, CloseDataPtr *closePtrList) {
Common::Rect objRect;
while (closePtr) {
objRect = Common::Rect(_utils->scaleX(closePtr->_x1), _utils->scaleX(closePtr->_y1), _utils->scaleX(closePtr->_x2), _utils->scaleX(closePtr->_y2));
objRect = _utils->rectScale(closePtr->_x1, closePtr->_y1, closePtr->_x2, closePtr->_y2);
if (objRect.contains(pos) && (closePtr->_closeUpType < 0)) {
_conditions->inclElement(abs(closePtr->_closeUpType));
return true;