diff options
| -rw-r--r-- | engines/voyeur/events.cpp | 7 | ||||
| -rw-r--r-- | engines/voyeur/events.h | 4 | ||||
| -rw-r--r-- | engines/voyeur/files_threads.cpp | 6 |
3 files changed, 9 insertions, 8 deletions
diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp index 2cf3d9edb5..866706daa5 100644 --- a/engines/voyeur/events.cpp +++ b/engines/voyeur/events.cpp @@ -237,14 +237,15 @@ void EventsManager::pollEvents() { return; case Common::EVENT_LBUTTONDOWN: _mouseButton = 1; - _vm->_voy._incriminate = true; + _vm->_voy._newMouseClicked = true; return; case Common::EVENT_RBUTTONDOWN: _mouseButton = 2; + _vm->_voy._newMouseClicked = true; return; case Common::EVENT_LBUTTONUP: case Common::EVENT_RBUTTONUP: - _vm->_voy._incriminate = false; + _vm->_voy._newMouseClicked = false; _mouseButton = 0; return; case Common::EVENT_MOUSEMOVE: @@ -437,7 +438,7 @@ void EventsManager::getMouseInfo() { } _vm->_voy._incriminate = _vm->_voy._newIncriminate; - _vm->_voy._lastInplay = _vm->_voy._newLastInplay; + _vm->_voy._mouseClicked = _vm->_voy._newMouseClicked; _vm->_voy._fadeFunc = _vm->_voy._newFadeFunc; _vm->_voy._fadeICF1 = _vm->_voy._newFadeICF1; } diff --git a/engines/voyeur/events.h b/engines/voyeur/events.h index 9fe3464431..b341a238a9 100644 --- a/engines/voyeur/events.h +++ b/engines/voyeur/events.h @@ -124,13 +124,13 @@ public: int _fadeICF0; int _fadeICF1; void (*_fadeFunc)(); - int _lastInplay; + bool _mouseClicked; int _incriminate; int _policeEvent; // Fields not originally in _voy, but I'm putting in for convenience int _newIncriminate; - int _newLastInplay; + bool _newMouseClicked; int _newFadeICF1; void (*_newFadeFunc)(); }; diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp index c4e4708391..70bbf32b4b 100644 --- a/engines/voyeur/files_threads.cpp +++ b/engines/voyeur/files_threads.cpp @@ -1135,7 +1135,7 @@ int ThreadResource::doApt() { _vm->_graphicsManager.flipPage(); _vm->_eventsManager.sWaitFlip(); - } while (!_vm->shouldQuit() && (!_vm->_voy._lastInplay || hotspotId == -1)); + } while (!_vm->shouldQuit() && (!_vm->_voy._mouseClicked || hotspotId == -1)); pt = _vm->_eventsManager.getMousePos(); _doAptPosX = pt.x; @@ -1331,7 +1331,7 @@ int ThreadResource::doInterface() { _vm->_voy._field474 = 17; _vm->_soundManager.stopVOCPlay(); _vm->checkTransition(); - _vm->_voy._lastInplay = true; + _vm->_voy._mouseClicked = true; } else { _vm->_voy._field478 = 1; _currentMouseX = pt.x; @@ -1355,7 +1355,7 @@ int ThreadResource::doInterface() { } } } while (!_vm->_voy._fadeFunc && !_vm->shouldQuit() && - (!_vm->_voy._lastInplay || var8 == -1)); + (!_vm->_voy._mouseClicked || var8 == -1)); _vm->_voy._field478 |= 1; _vm->_bVoy->freeBoltGroup(_vm->_playStamp1); |