aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2013-06-20 21:42:48 -0400
committerPaul Gilbert2013-06-20 21:42:48 -0400
commit1c34c1847e456c68b9633bb045d833b2b0e6e501 (patch)
treedec90e463b803ebd0a2a721fb7fa080df9e25dec
parentff270eb61e49a10401b6643b7c5b430268597789 (diff)
downloadscummvm-rg350-1c34c1847e456c68b9633bb045d833b2b0e6e501.tar.gz
scummvm-rg350-1c34c1847e456c68b9633bb045d833b2b0e6e501.tar.bz2
scummvm-rg350-1c34c1847e456c68b9633bb045d833b2b0e6e501.zip
VOYEUR: Lock screen mouse clicks now working
-rw-r--r--engines/voyeur/events.cpp2
-rw-r--r--engines/voyeur/voyeur.cpp1
-rw-r--r--engines/voyeur/voyeur.h2
3 files changed, 4 insertions, 1 deletions
diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp
index ce481e0594..e96ff12bd1 100644
--- a/engines/voyeur/events.cpp
+++ b/engines/voyeur/events.cpp
@@ -194,12 +194,14 @@ void EventsManager::pollEvents() {
return;
case Common::EVENT_LBUTTONDOWN:
_mouseButton = 1;
+ _vm->_voy._incriminate = true;
return;
case Common::EVENT_RBUTTONDOWN:
_mouseButton = 2;
return;
case Common::EVENT_LBUTTONUP:
case Common::EVENT_RBUTTONUP:
+ _vm->_voy._incriminate = false;
_mouseButton = 0;
return;
case Common::EVENT_MOUSEMOVE:
diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp
index 276fd323cf..5afc46152e 100644
--- a/engines/voyeur/voyeur.cpp
+++ b/engines/voyeur/voyeur.cpp
@@ -303,6 +303,7 @@ bool VoyeurEngine::doLock() {
_eventsManager.delay(1);
} while (!shouldQuit() && !_voy._incriminate);
+ _voy._incriminate = false;
} while (!shouldQuit() && key == -1);
_soundManager.abortVOCMap();
diff --git a/engines/voyeur/voyeur.h b/engines/voyeur/voyeur.h
index 7a156b8f3f..95a664e7aa 100644
--- a/engines/voyeur/voyeur.h
+++ b/engines/voyeur/voyeur.h
@@ -66,7 +66,6 @@ private:
Common::RandomSource _randomSource;
BoltFile *_bVoy;
- SVoy _voy;
Common::Array<int> _resolves;
FontInfoResource _defaultFontInfo;
@@ -90,6 +89,7 @@ public:
FilesManager _filesManager;
GraphicsManager _graphicsManager;
SoundManager _soundManager;
+ SVoy _voy;
public:
VoyeurEngine(OSystem *syst, const VoyeurGameDescription *gameDesc);
virtual ~VoyeurEngine();