diff options
| author | Paul Gilbert | 2013-12-28 19:53:00 +1100 |
|---|---|---|
| committer | Paul Gilbert | 2013-12-28 19:53:00 +1100 |
| commit | f88c4727781b6e6eea4a8a5a7dd09ae90e55ba68 (patch) | |
| tree | 1b2c586f92bbf4b0155277b7ecb0ce02c640f437 /engines/voyeur/events.cpp | |
| parent | f01ff9a938acbaaaf04b553b4b65b2a98eb0f684 (diff) | |
| download | scummvm-rg350-f88c4727781b6e6eea4a8a5a7dd09ae90e55ba68.tar.gz scummvm-rg350-f88c4727781b6e6eea4a8a5a7dd09ae90e55ba68.tar.bz2 scummvm-rg350-f88c4727781b6e6eea4a8a5a7dd09ae90e55ba68.zip | |
VOYEUR: Fixed naming of mouse state flags
Diffstat (limited to 'engines/voyeur/events.cpp')
| -rw-r--r-- | engines/voyeur/events.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp index b5643e44e6..94f137e569 100644 --- a/engines/voyeur/events.cpp +++ b/engines/voyeur/events.cpp @@ -218,7 +218,7 @@ void EventsManager::delayClick(int cycles) { uint32 delayEnd = g_system->getMillis() + totalMilli; while (!_vm->shouldQuit() && g_system->getMillis() < delayEnd - && !_vm->_voy._incriminate) { + && !_vm->_voy._mouseClicked) { g_system->delayMillis(10); pollEvents(); @@ -244,17 +244,19 @@ void EventsManager::pollEvents() { return; case Common::EVENT_LBUTTONDOWN: _mouseButton = 1; + _vm->_voy._newLeftClick = true; _vm->_voy._newMouseClicked = true; - _vm->_voy._newIncriminate = true; return; case Common::EVENT_RBUTTONDOWN: _mouseButton = 2; + _vm->_voy._newRightClick = true; _vm->_voy._newMouseClicked = true; return; case Common::EVENT_LBUTTONUP: case Common::EVENT_RBUTTONUP: _vm->_voy._newMouseClicked = false; - _vm->_voy._newIncriminate = false; + _vm->_voy._newLeftClick = false; + _vm->_voy._newRightClick = false; _mouseButton = 0; return; case Common::EVENT_MOUSEMOVE: @@ -456,10 +458,10 @@ void EventsManager::getMouseInfo() { } } - _vm->_voy._incriminate = _vm->_voy._newIncriminate; _vm->_voy._mouseClicked = _vm->_voy._newMouseClicked; - _vm->_voy._fadeFunc = _vm->_voy._newFadeFunc; - _vm->_voy._fadeICF1 = _vm->_voy._newFadeICF1; + _vm->_voy._leftClick = _vm->_voy._newLeftClick; + _vm->_voy._rightClick = _vm->_voy._newRightClick; + _vm->_voy._mouseUnk = _vm->_voy._newMouseUnk; } void EventsManager::checkForKey() { |