thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

VOYEUR: Fix for doRoom start and looping

Browse source
This commit is contained in:
Paul Gilbert 2013-12-28 13:30:51 +11:00
parent 8ed1171ca0
commit 3b9cdf48ee
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/voyeur/events.cpp
View file

@ -233,6 +233,7 @@ void EventsManager::pollEvents() {
case Common::EVENT_LBUTTONDOWN: case Common::EVENT_LBUTTONDOWN:
_mouseButton = 1; _mouseButton = 1;
_vm->_voy._newMouseClicked = true; _vm->_voy._newMouseClicked = true;
_vm->_voy._newIncriminate = true;
return; return;
case Common::EVENT_RBUTTONDOWN: case Common::EVENT_RBUTTONDOWN:
_mouseButton = 2; _mouseButton = 2;
@ -241,6 +242,7 @@ void EventsManager::pollEvents() {
case Common::EVENT_LBUTTONUP: case Common::EVENT_LBUTTONUP:
case Common::EVENT_RBUTTONUP: case Common::EVENT_RBUTTONUP:
_vm->_voy._newMouseClicked = false; _vm->_voy._newMouseClicked = false;
_vm->_voy._newIncriminate = false;
_mouseButton = 0; _mouseButton = 0;
return; return;
case Common::EVENT_MOUSEMOVE: case Common::EVENT_MOUSEMOVE:

2
engines/voyeur/files.cpp
View file

@ -527,6 +527,8 @@ void BVoyBoltFile::initSoundMap() {
void BVoyBoltFile::sInitRect() { void BVoyBoltFile::sInitRect() {
_state._curMemberPtr->_data = _state.decompress(NULL, _state._curMemberPtr->_size, _state._curMemberPtr->_data = _state.decompress(NULL, _state._curMemberPtr->_size,
_state._curMemberPtr->_mode); _state._curMemberPtr->_mode);
if ((_state._curMemberPtr->_size % 8) == 0 || (_state._curMemberPtr->_size % 8) == 2)
_state._curMemberPtr->_rectResource = new RectResource(_state._curMemberPtr->_data, _state._curMemberPtr->_rectResource = new RectResource(_state._curMemberPtr->_data,
_state._curMemberPtr->_size); _state._curMemberPtr->_size);
} }

2
engines/voyeur/voyeur_game.cpp
View file

@ -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.sDrawPic(pic, *_graphicsManager._vPort, Common::Point(784 - pt.x - 712, 150 - pt.y + 136));
} }
(*_graphicsManager._vPort)->setupViewPort(); (*_graphicsManager._vPort)->setupViewPort(NULL);
} }
void VoyeurEngine::checkTransition(){ void VoyeurEngine::checkTransition(){