diff options
| author | Filippos Karapetis | 2015-12-07 10:40:40 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-12-23 21:33:53 +0100 |
| commit | 6bba608fc06658cec8f0bc09874739ae8b4bc9e4 (patch) | |
| tree | cb2369e78619f92a9c592c90ae480d85ff902db8 /engines/lab | |
| parent | 5ccc0fd7c6469e1b1bac6b32a4624a88e0c78278 (diff) | |
| download | scummvm-rg350-6bba608fc06658cec8f0bc09874739ae8b4bc9e4.tar.gz scummvm-rg350-6bba608fc06658cec8f0bc09874739ae8b4bc9e4.tar.bz2 scummvm-rg350-6bba608fc06658cec8f0bc09874739ae8b4bc9e4.zip | |
LAB: Get rid of _numHidden
Diffstat (limited to 'engines/lab')
| -rw-r--r-- | engines/lab/eventman.cpp | 13 | ||||
| -rw-r--r-- | engines/lab/eventman.h | 1 |
2 files changed, 2 insertions, 12 deletions
diff --git a/engines/lab/eventman.cpp b/engines/lab/eventman.cpp index 1c204b75eb..4c50cb78c3 100644 --- a/engines/lab/eventman.cpp +++ b/engines/lab/eventman.cpp @@ -98,7 +98,6 @@ EventManager::EventManager(LabEngine *vm) : _vm(vm) { _rightClick = false; _mouseHidden = true; - _numHidden = 1; _lastGadgetHit = nullptr; _screenGadgetList = nullptr; _hitGadget = nullptr; @@ -113,9 +112,6 @@ EventManager::EventManager(LabEngine *vm) : _vm(vm) { } void EventManager::mouseHandler(int flag, Common::Point pos) { - if (_numHidden >= 2) - return; - if (flag & 0x02) { /* Left mouse button click */ Gadget *tmp = NULL; if (_screenGadgetList) @@ -172,10 +168,7 @@ void EventManager::initMouse() { /* Shows the mouse. */ /*****************************************************************************/ void EventManager::mouseShow() { - if (_numHidden) - _numHidden--; - - if ((_numHidden == 0) && _mouseHidden) { + if (_mouseHidden) { processInput(); _mouseHidden = false; } @@ -187,9 +180,7 @@ void EventManager::mouseShow() { /* Hides the mouse. */ /*****************************************************************************/ void EventManager::mouseHide() { - _numHidden++; - - if (_numHidden && !_mouseHidden) { + if (!_mouseHidden) { _mouseHidden = true; g_system->showMouse(false); diff --git a/engines/lab/eventman.h b/engines/lab/eventman.h index a156a8a823..11d8dfd7e1 100644 --- a/engines/lab/eventman.h +++ b/engines/lab/eventman.h @@ -44,7 +44,6 @@ private: bool _rightClick; bool _mouseHidden; - int32 _numHidden; Gadget *_lastGadgetHit; uint16 _nextKeyIn; uint16 _nextKeyOut; |