diff options
author | Paul Gilbert | 2016-06-24 07:34:02 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-07-15 19:24:39 -0400 |
commit | 9ae0a76333a2258d92996a62a6cc7b1e630107b6 (patch) | |
tree | 57eade79680576913fccc3c4b473e25944e01146 /engines/titanic/pet_control/pet_rooms_glyphs.cpp | |
parent | ec5dcc17dc75a1b74a417676edf0c51048e19b6c (diff) | |
download | scummvm-rg350-9ae0a76333a2258d92996a62a6cc7b1e630107b6.tar.gz scummvm-rg350-9ae0a76333a2258d92996a62a6cc7b1e630107b6.tar.bz2 scummvm-rg350-9ae0a76333a2258d92996a62a6cc7b1e630107b6.zip |
TITANIC: Properly named several PET Glyph virtual methods
Diffstat (limited to 'engines/titanic/pet_control/pet_rooms_glyphs.cpp')
-rw-r--r-- | engines/titanic/pet_control/pet_rooms_glyphs.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/engines/titanic/pet_control/pet_rooms_glyphs.cpp b/engines/titanic/pet_control/pet_rooms_glyphs.cpp index 7f6ebd6898..b0a486d574 100644 --- a/engines/titanic/pet_control/pet_rooms_glyphs.cpp +++ b/engines/titanic/pet_control/pet_rooms_glyphs.cpp @@ -101,7 +101,7 @@ void CPetRoomsGlyph::drawAt(CScreenManager *screenManager, const Point &pt, bool _object5 = obj5; } -void CPetRoomsGlyph::proc28(const Point &topLeft, const Point &pt) { +void CPetRoomsGlyph::selectGlyph(const Point &topLeft, const Point &pt) { if (isAssigned()) { bool isShiftPressed = g_vm->_events->getSpecialButtons() & MK_SHIFT; @@ -115,7 +115,7 @@ void CPetRoomsGlyph::proc28(const Point &topLeft, const Point &pt) { } } -int CPetRoomsGlyph::proc29(const Point &pt) { +bool CPetRoomsGlyph::dragGlyph(const Point &topLeft, CMouseDragStartMsg *msg) { bool isShiftPressed = g_vm->_events->getSpecialButtons() & MK_SHIFT; CPetControl *petControl = getPetControl(); @@ -128,12 +128,15 @@ int CPetRoomsGlyph::proc29(const Point &pt) { petControl->removeFromInventory(chevron, false, false); chevron->loadSurface(); - warning("TODO: CPetRoomsGlyph::proc29"); - // TODO + chevron->dragMove(msg->_mousePos); + msg->_handled = true; + + if (msg->execute(chevron)) + return true; } } - return 0; + return false; } void CPetRoomsGlyph::getTooltip(CPetText *text) { |