aboutsummaryrefslogtreecommitdiff
path: root/engines/macventure/gui.cpp
diff options
context:
space:
mode:
authorBorja Lorente2016-07-09 19:46:10 +0200
committerBorja Lorente2016-08-14 18:50:19 +0200
commitfdd949bb00d5d3b5bda54ef85f8fde3682dc2c27 (patch)
treee978ad1f46761d947e2264c9e256f29c2705bed7 /engines/macventure/gui.cpp
parent9ac125392587aa02f1e874fd5bf095cb56da9564 (diff)
downloadscummvm-rg350-fdd949bb00d5d3b5bda54ef85f8fde3682dc2c27.tar.gz
scummvm-rg350-fdd949bb00d5d3b5bda54ef85f8fde3682dc2c27.tar.bz2
scummvm-rg350-fdd949bb00d5d3b5bda54ef85f8fde3682dc2c27.zip
MACVENTURE: Fix exits drawing
Diffstat (limited to 'engines/macventure/gui.cpp')
-rw-r--r--engines/macventure/gui.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/engines/macventure/gui.cpp b/engines/macventure/gui.cpp
index 05c479be83..5a26482e9d 100644
--- a/engines/macventure/gui.cpp
+++ b/engines/macventure/gui.cpp
@@ -717,8 +717,8 @@ void Gui::drawDraggedObject() {
ImageAsset *asset = _assets[_draggedObj.id];
_draggedSurface.create(asset->getWidth(), asset->getHeight(), _screen.format);
- _screen.copyRectToSurface(_draggedSurface, _draggedObj.pos.x, _draggedObj.pos.y,
- Common::Rect(asset->getWidth() - 1, asset->getHeight() - 1));
+ //_screen.copyRectToSurface(_draggedSurface, _draggedObj.pos.x, _draggedObj.pos.y,
+ // Common::Rect(asset->getWidth() - 1, asset->getHeight() - 1));
asset->blitInto(&_draggedSurface, 0, 0, kBlitBIC);
@@ -773,6 +773,10 @@ void Gui::updateWindow(WindowReference winID, bool containerOpen) {
}
}
+void Gui::clearExits() {
+ _exitsData->clear();
+}
+
void Gui::unselectExits() {
Common::Array<CommandButton>::const_iterator it = _exitsData->begin();
for (; it != _exitsData->end(); ++it) {
@@ -806,8 +810,8 @@ void Gui::updateExit(ObjID obj) {
data.titleLength = 0;
data.refcon = (ControlAction)obj; // Objects can be exits (actions)
Common::Point pos = _engine->getObjExitPosition(obj);
- pos.x = border.leftOffset;
- pos.y = border.topOffset;
+ pos.x += border.leftOffset;
+ pos.y += border.topOffset;
data.bounds = Common::Rect(pos.x, pos.y, pos.x + kExitButtonWidth, pos.y + kExitButtonHeight);
data.visible = true;