[Scummvm-git-logs] scummvm master -> cf061845ba68a6c2a7a84898c56b4d4ffc9b714e
dreammaster
dreammaster at scummvm.org
Sun Dec 18 23:01:13 CET 2016
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:
cf061845ba TITANIC: Fix starting to drag inventory items
Commit: cf061845ba68a6c2a7a84898c56b4d4ffc9b714e
https://github.com/scummvm/scummvm/commit/cf061845ba68a6c2a7a84898c56b4d4ffc9b714e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-18T17:01:11-05:00
Commit Message:
TITANIC: Fix starting to drag inventory items
Changed paths:
engines/titanic/pet_control/pet_inventory_glyphs.cpp
diff --git a/engines/titanic/pet_control/pet_inventory_glyphs.cpp b/engines/titanic/pet_control/pet_inventory_glyphs.cpp
index 75b1fc9..74d769a 100644
--- a/engines/titanic/pet_control/pet_inventory_glyphs.cpp
+++ b/engines/titanic/pet_control/pet_inventory_glyphs.cpp
@@ -118,15 +118,15 @@ bool CPetInventoryGlyph::dragGlyph(const Point &topLeft, CMouseDragStartMsg *msg
petControl->removeFromInventory(_item, carryParcel, false, true);
petControl->removeFromInventory(_item, false, false);
- carryParcel->setPosition(Point(msg->_mousePos.x - carryParcel->getBounds().width() / 2,
- msg->_mousePos.y - carryParcel->getBounds().height() / 2));
+ carryParcel->setPosition(Point(msg->_mousePos.x - carryParcel->_bounds.width() / 2,
+ msg->_mousePos.y - carryParcel->_bounds.height() / 2));
carryParcel->setPosition(Point(SCREEN_WIDTH, SCREEN_HEIGHT));
item = carryParcel;
} else {
petControl->removeFromInventory(_item, false, true);
- _item->setPosition(Point(msg->_mousePos.x - _item->getBounds().width() / 2,
- msg->_mousePos.y - _item->getBounds().height() / 2));
+ _item->setPosition(Point(msg->_mousePos.x - _item->_bounds.width() / 2,
+ msg->_mousePos.y - _item->_bounds.height() / 2));
_item->setVisible(true);
}
More information about the Scummvm-git-logs
mailing list