diff options
author | richiesams | 2013-08-24 00:09:15 -0500 |
---|---|---|
committer | richiesams | 2013-08-24 00:23:41 -0500 |
commit | 0da3d3e5eb3c332f943a63fea4e3777fb24ba577 (patch) | |
tree | 0c5d0aaf337a0a8ea8ee3da71b3a0d3f257a770e /engines/zvision | |
parent | 3054489a8bcc9604028ac16a0b074e13bff258eb (diff) | |
download | scummvm-rg350-0da3d3e5eb3c332f943a63fea4e3777fb24ba577.tar.gz scummvm-rg350-0da3d3e5eb3c332f943a63fea4e3777fb24ba577.tar.bz2 scummvm-rg350-0da3d3e5eb3c332f943a63fea4e3777fb24ba577.zip |
ZVISION: Convert _mouseEvents to pointers since MouseEvent is now abstract
Diffstat (limited to 'engines/zvision')
-rw-r--r-- | engines/zvision/events.cpp | 35 | ||||
-rw-r--r-- | engines/zvision/zvision.h | 4 |
2 files changed, 20 insertions, 19 deletions
diff --git a/engines/zvision/events.cpp b/engines/zvision/events.cpp index 798d75b375..f751d02386 100644 --- a/engines/zvision/events.cpp +++ b/engines/zvision/events.cpp @@ -37,14 +37,14 @@ namespace ZVision { -void ZVision::registerMouseEvent(const MouseEvent &event) { +void ZVision::registerMouseEvent(MouseEvent *event) { _mouseEvents.push_back(event); } bool ZVision::removeMouseEvent(const uint32 key) { - for (Common::List<MouseEvent>::iterator iter = _mouseEvents.begin(); iter != _mouseEvents.end(); iter++) { - if ((*iter)._key == key) { - _scriptManager->setStateValue((*iter)._key, 0); + for (Common::List<MouseEvent *>::iterator iter = _mouseEvents.begin(); iter != _mouseEvents.end(); iter++) { + if ((*iter)->_key == key) { + _scriptManager->setStateValue((*iter)->_key, 0); _mouseEvents.erase(iter); return true; } @@ -55,8 +55,10 @@ bool ZVision::removeMouseEvent(const uint32 key) { void ZVision::clearAllMouseEvents() { // Clear the state values of all the events - for (Common::List<MouseEvent>::iterator iter = _mouseEvents.begin(); iter != _mouseEvents.end(); iter++) { - _scriptManager->setStateValue((*iter)._key, 0); + // Then delete the nodes + for (Common::List<MouseEvent *>::iterator iter = _mouseEvents.begin(); iter != _mouseEvents.end(); iter++) { + _scriptManager->setStateValue((*iter)->_key, 0); + delete (*iter); } _mouseEvents.clear(); @@ -117,6 +119,12 @@ void ZVision::processEvents() { void ZVision::onMouseDown(const Common::Point &pos) { _cursorManager->cursorDown(true); + + Common::Point imageCoord(_renderManager->screenSpaceToImageSpace(pos)); + + for (Common::List<MouseEvent *>::iterator iter = _mouseEvents.begin(); iter != _mouseEvents.end(); iter++) { + (*iter)->onMouseDown(pos, imageCoord); + } } void ZVision::onMouseUp(const Common::Point &pos) { @@ -124,10 +132,8 @@ void ZVision::onMouseUp(const Common::Point &pos) { Common::Point imageCoord(_renderManager->screenSpaceToImageSpace(pos)); - for (Common::List<MouseEvent>::iterator iter = _mouseEvents.begin(); iter != _mouseEvents.end(); iter++) { - if (iter->withinHotspot(imageCoord)) { - iter->onClick(this); - } + for (Common::List<MouseEvent *>::iterator iter = _mouseEvents.begin(); iter != _mouseEvents.end(); iter++) { + (*iter)->onMouseUp(pos, imageCoord); } } @@ -135,13 +141,8 @@ void ZVision::onMouseMove(const Common::Point &pos) { Common::Point imageCoord(_renderManager->screenSpaceToImageSpace(pos)); bool isWithinAHotspot = false; - if (_workingWindow.contains(pos)) { - for (Common::List<MouseEvent>::iterator iter = _mouseEvents.begin(); iter != _mouseEvents.end(); iter++) { - if (iter->withinHotspot(imageCoord)) { - _cursorManager->changeCursor(iter->getHoverCursor()); - isWithinAHotspot = true; - } - } + for (Common::List<MouseEvent *>::iterator iter = _mouseEvents.begin(); iter != _mouseEvents.end(); iter++) { + cursorWasChanged = cursorWasChanged || (*iter)->onMouseMove(pos, imageCoord); } // Graph of the function governing rotation velocity: diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h index 844b8ad18f..84e4da9d20 100644 --- a/engines/zvision/zvision.h +++ b/engines/zvision/zvision.h @@ -101,7 +101,7 @@ private: Clock _clock; // To store the current mouse events - Common::List<MouseEvent> _mouseEvents; + Common::List<MouseEvent *> _mouseEvents; // To prevent allocation every time we process events Common::Event _event; @@ -137,7 +137,7 @@ public: * * @param event The event to register */ - void registerMouseEvent(const MouseEvent &event); + void registerMouseEvent(MouseEvent *event); bool removeMouseEvent(const uint32 key); |