[Scummvm-git-logs] scummvm master -> 27e141eaf4686a652c3a196263e64d082702a2cb

[dreammaster]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ed04ef4929 VOYEUR: Fix playback of audio events on VCR, thanks to Bakhtosh
27e141eaf4 VOYEUR: Fix exiting game from the VCR screen


Commit: ed04ef492994549188b98be0bae42bc32313b967
    https://github.com/scummvm/scummvm/commit/ed04ef492994549188b98be0bae42bc32313b967
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-06T22:58:09-04:00

Commit Message:
VOYEUR: Fix playback of audio events on VCR, thanks to Bakhtosh

Changed paths:
    engines/voyeur/voyeur_game.cpp


diff --git a/engines/voyeur/voyeur_game.cpp b/engines/voyeur/voyeur_game.cpp
index e959195..2c84a4c 100644
--- a/engines/voyeur/voyeur_game.cpp
+++ b/engines/voyeur/voyeur_game.cpp
@@ -674,9 +674,9 @@ void VoyeurEngine::reviewTape() {
 
 			_bVoy->getBoltGroup(0x7F00);
 			_screen->_backgroundPage = _bVoy->boltEntry(0x7F00 +
-				BLIND_TABLE[_audioVideoId])._picResource;
+				BLIND_TABLE[_audioVideoId] * 2)._picResource;
 			_screen->_backColors = _bVoy->boltEntry(0x7F01 +
-				BLIND_TABLE[_audioVideoId])._cMapResource;
+				BLIND_TABLE[_audioVideoId] * 2)._cMapResource;
 
 			_screen->_vPort->setupViewPort(_screen->_backgroundPage);
 			_screen->_backColors->startFade();
@@ -688,7 +688,10 @@ void VoyeurEngine::reviewTape() {
 
 			// Play sound for the given duration
 			_soundManager->setVOCOffset(_voy->_vocSecondsOffset);
-			_soundManager->startVOCPlay(_audioVideoId + 159);
+			Common::String filename = _soundManager->getVOCFileName(
+				_audioVideoId + 159);
+			_soundManager->startVOCPlay(filename);
+
 			uint32 secondsDuration = e._computerOff;
 
 			_eventsManager->getMouseInfo();


Commit: 27e141eaf4686a652c3a196263e64d082702a2cb
    https://github.com/scummvm/scummvm/commit/27e141eaf4686a652c3a196263e64d082702a2cb
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-06T23:02:55-04:00

Commit Message:
VOYEUR: Fix exiting game from the VCR screen

Changed paths:
    engines/voyeur/events.cpp
    engines/voyeur/voyeur_game.cpp


diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp
index 020fe4b..ae7e300 100644
--- a/engines/voyeur/events.cpp
+++ b/engines/voyeur/events.cpp
@@ -245,7 +245,7 @@ void EventsManager::pollEvents() {
 	checkForNextFrameCounter();
 
 	Common::Event event;
-	while (g_system->getEventManager()->pollEvent(event)) {
+	while (g_system->getEventManager()->pollEvent(event) && !_vm->shouldQuit()) {
 		// Handle keypress
 		switch (event.type) {
 		case Common::EVENT_QUIT:
diff --git a/engines/voyeur/voyeur_game.cpp b/engines/voyeur/voyeur_game.cpp
index 2c84a4c..7ffba7f 100644
--- a/engines/voyeur/voyeur_game.cpp
+++ b/engines/voyeur/voyeur_game.cpp
@@ -61,6 +61,8 @@ void VoyeurEngine::playStamp() {
 		switch (_voy->_playStampMode) {
 		case 5:
 			buttonId = _mainThread->doInterface();
+			if (shouldQuit())
+				return;
 
 			if (buttonId == -2) {
 				switch (_mainThread->doApt()) {
@@ -647,6 +649,9 @@ void VoyeurEngine::reviewTape() {
 
 		} while (!shouldQuit() && (!_eventsManager->_mouseClicked || foundIndex == -1));
 
+		if (shouldQuit())
+			return;
+
 		newY = _eventsManager->getMousePos().y;
 		_voy->_fadingType = 0;
 		_voy->_viewBounds = nullptr;