[Scummvm-git-logs] scummvm master -> 43440193f02078c4b4b014ded366d06655a53ae5

[dreammaster]

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

Summary:
43440193f0 VOYEUR: Fix backgrounds not showing for static rooms


Commit: 43440193f02078c4b4b014ded366d06655a53ae5
    https://github.com/scummvm/scummvm/commit/43440193f02078c4b4b014ded366d06655a53ae5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-06-10T18:21:04-04:00

Commit Message:
VOYEUR: Fix backgrounds not showing for static rooms

Changed paths:
    engines/voyeur/files_threads.cpp
    engines/voyeur/screen.cpp


diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp
index bbd3dfe..d22dcd0 100644
--- a/engines/voyeur/files_threads.cpp
+++ b/engines/voyeur/files_threads.cpp
@@ -1186,6 +1186,7 @@ void ThreadResource::doRoom() {
 			}
 
 			vm._eventsManager->_intPtr._hasPalette = true;
+			vm._screen->_vPort->_flags |= DISPFLAG_8;
 			vm._screen->flipPage();
 			vm._eventsManager->sWaitFlip();
 		} while (!vm.shouldQuit() && !vm._eventsManager->_mouseClicked);
diff --git a/engines/voyeur/screen.cpp b/engines/voyeur/screen.cpp
index ca92483..4d34078 100644
--- a/engines/voyeur/screen.cpp
+++ b/engines/voyeur/screen.cpp
@@ -910,10 +910,13 @@ void Screen::flipPage() {
 	bool flipFlag = false;
 
 	for (uint idx = 0; idx < viewPorts.size(); ++idx) {
-		if ((viewPorts[idx]->_flags & (DISPFLAG_20 | DISPFLAG_8 | DISPFLAG_1)) == (DISPFLAG_20 | DISPFLAG_8 | DISPFLAG_1)) {
-			if (_planeSelect == idx)
-				sDisplayPic(viewPorts[idx]->_currentPic);
-			flipFlag = true;
+		if (viewPorts[idx]->_flags & DISPFLAG_20) {
+			flipFlag = false;
+			if ((viewPorts[idx]->_flags & DISPFLAG_8) && (viewPorts[idx]->_flags & DISPFLAG_1)) {
+				if (_planeSelect == idx)
+					sDisplayPic(viewPorts[idx]->_currentPic);
+				flipFlag = true;
+			}
 		}
 
 		if (flipFlag) {