diff options
author | Paul Gilbert | 2013-12-28 13:30:51 +1100 |
---|---|---|
committer | Paul Gilbert | 2013-12-28 13:30:51 +1100 |
commit | 3b9cdf48eec9afc3664d04fa1ecbd71c94eb8cf5 (patch) | |
tree | 40fecbe18a50192934b961cd2a443d64b02b15d4 /engines | |
parent | 8ed1171ca07e5857c1ab4862052bc7451f8728e7 (diff) | |
download | scummvm-rg350-3b9cdf48eec9afc3664d04fa1ecbd71c94eb8cf5.tar.gz scummvm-rg350-3b9cdf48eec9afc3664d04fa1ecbd71c94eb8cf5.tar.bz2 scummvm-rg350-3b9cdf48eec9afc3664d04fa1ecbd71c94eb8cf5.zip |
VOYEUR: Fix for doRoom start and looping
Diffstat (limited to 'engines')
-rw-r--r-- | engines/voyeur/events.cpp | 2 | ||||
-rw-r--r-- | engines/voyeur/files.cpp | 2 | ||||
-rw-r--r-- | engines/voyeur/voyeur_game.cpp | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp index b78105825e..4d5c03ce60 100644 --- a/engines/voyeur/events.cpp +++ b/engines/voyeur/events.cpp @@ -233,6 +233,7 @@ void EventsManager::pollEvents() { case Common::EVENT_LBUTTONDOWN: _mouseButton = 1; _vm->_voy._newMouseClicked = true; + _vm->_voy._newIncriminate = true; return; case Common::EVENT_RBUTTONDOWN: _mouseButton = 2; @@ -241,6 +242,7 @@ void EventsManager::pollEvents() { case Common::EVENT_LBUTTONUP: case Common::EVENT_RBUTTONUP: _vm->_voy._newMouseClicked = false; + _vm->_voy._newIncriminate = false; _mouseButton = 0; return; case Common::EVENT_MOUSEMOVE: diff --git a/engines/voyeur/files.cpp b/engines/voyeur/files.cpp index 1eefef40b1..2602ace735 100644 --- a/engines/voyeur/files.cpp +++ b/engines/voyeur/files.cpp @@ -527,6 +527,8 @@ void BVoyBoltFile::initSoundMap() { void BVoyBoltFile::sInitRect() { _state._curMemberPtr->_data = _state.decompress(NULL, _state._curMemberPtr->_size, _state._curMemberPtr->_mode); + + if ((_state._curMemberPtr->_size % 8) == 0 || (_state._curMemberPtr->_size % 8) == 2) _state._curMemberPtr->_rectResource = new RectResource(_state._curMemberPtr->_data, _state._curMemberPtr->_size); } diff --git a/engines/voyeur/voyeur_game.cpp b/engines/voyeur/voyeur_game.cpp index 9dec623e0f..badea5912f 100644 --- a/engines/voyeur/voyeur_game.cpp +++ b/engines/voyeur/voyeur_game.cpp @@ -891,7 +891,7 @@ void VoyeurEngine::doScroll(const Common::Point &pt) { _graphicsManager.sDrawPic(pic, *_graphicsManager._vPort, Common::Point(784 - pt.x - 712, 150 - pt.y + 136)); } - (*_graphicsManager._vPort)->setupViewPort(); + (*_graphicsManager._vPort)->setupViewPort(NULL); } void VoyeurEngine::checkTransition(){ |