diff options
author | Strangerke | 2015-12-03 01:06:04 +0100 |
---|---|---|
committer | Willem Jan Palenstijn | 2015-12-23 21:33:47 +0100 |
commit | 8fa64824a2dc1b5b2470f2ae4830f5573f5d01df (patch) | |
tree | 2870d7053ed408ccc35369deeb68bc952c369516 /engines/lab/mouse.cpp | |
parent | 1d13083b29c3b4bd3e1423a4cbdc6dc32a50de22 (diff) | |
download | scummvm-rg350-8fa64824a2dc1b5b2470f2ae4830f5573f5d01df.tar.gz scummvm-rg350-8fa64824a2dc1b5b2470f2ae4830f5573f5d01df.tar.bz2 scummvm-rg350-8fa64824a2dc1b5b2470f2ae4830f5573f5d01df.zip |
LAB: Some renaming, move a couple of variables to game engine
Diffstat (limited to 'engines/lab/mouse.cpp')
-rw-r--r-- | engines/lab/mouse.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/lab/mouse.cpp b/engines/lab/mouse.cpp index 38b893511d..b676f2cd37 100644 --- a/engines/lab/mouse.cpp +++ b/engines/lab/mouse.cpp @@ -61,21 +61,21 @@ static byte MouseData[] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, Gadget *EventManager::checkGadgetHit(Gadget *gadgetList, Common::Point pos) { while (gadgetList != NULL) { if ((pos.x >= gadgetList->x) && (pos.y >= gadgetList->y) && - (pos.x <= (gadgetList->x + gadgetList->Im->Width)) && - (pos.y <= (gadgetList->y + gadgetList->Im->Height)) && + (pos.x <= (gadgetList->x + gadgetList->_image->Width)) && + (pos.y <= (gadgetList->y + gadgetList->_image->Height)) && !(GADGETOFF & gadgetList->GadgetFlags)) { if (_vm->_isHiRes) { _hitGadget = gadgetList; } else { mouseHide(); - gadgetList->ImAlt->drawImage(gadgetList->x, gadgetList->y); + gadgetList->_altImage->drawImage(gadgetList->x, gadgetList->y); mouseShow(); for (uint16 i = 0; i < 3; i++) _vm->waitTOF(); mouseHide(); - gadgetList->Im->drawImage(gadgetList->x, gadgetList->y); + gadgetList->_image->drawImage(gadgetList->x, gadgetList->y); mouseShow(); } @@ -143,14 +143,14 @@ void EventManager::updateMouse() { if (_hitGadget) { mouseHide(); - _hitGadget->ImAlt->drawImage(_hitGadget->x, _hitGadget->y); + _hitGadget->_altImage->drawImage(_hitGadget->x, _hitGadget->y); mouseShow(); for (uint16 i = 0; i < 3; i++) _vm->waitTOF(); mouseHide(); - _hitGadget->Im->drawImage(_hitGadget->x, _hitGadget->y); + _hitGadget->_image->drawImage(_hitGadget->x, _hitGadget->y); mouseShow(); doUpdateDisplay = true; _hitGadget = nullptr; |