[Scummvm-git-logs] scummvm master -> 4778aa9769c3a1e1663a4d17f9279e21a0d39ba2

[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:
4778aa9769 VOYEUR: Preliminary support for Voyeur demo (without title)


Commit: 4778aa9769c3a1e1663a4d17f9279e21a0d39ba2
    https://github.com/scummvm/scummvm/commit/4778aa9769c3a1e1663a4d17f9279e21a0d39ba2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-06-03T17:24:57-07:00

Commit Message:
VOYEUR: Preliminary support for Voyeur demo (without title)

Changed paths:
    engines/voyeur/detection_tables.h
    engines/voyeur/voyeur.cpp


diff --git a/engines/voyeur/detection_tables.h b/engines/voyeur/detection_tables.h
index b6ff2c3a98..debc67cbb7 100644
--- a/engines/voyeur/detection_tables.h
+++ b/engines/voyeur/detection_tables.h
@@ -28,14 +28,27 @@ static const VoyeurGameDescription gameDescriptions[] = {
 		{
 			"voyeur",
 			0,
-			AD_ENTRY1s("a1100100.rl2", "b44630677618d034970ca0a13c1c1237", 336361),
+            AD_ENTRY1s("bvoy.blt", "12e9e10654171501cf8be3a7aa7198e1", 13036269),
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
 			GUIO1(GUIO_NOMIDI)
-		},
+		}
 	},
 
+	{
+        // Voyeur DOS English
+        {
+            "voyeur",
+            "Demo",
+            AD_ENTRY1s("bvoy.blt", "abd10f241b845ebc2a76d27a43770709", 13015827),
+            Common::EN_ANY,
+            Common::kPlatformDOS,
+            ADGF_DEMO,
+            GUIO1(GUIO_NOMIDI)
+		}
+    },
+
 	{ AD_TABLE_END_MARKER }
 };
 
diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp
index b3aebf1c07..98c5d7b81a 100644
--- a/engines/voyeur/voyeur.cpp
+++ b/engines/voyeur/voyeur.cpp
@@ -164,7 +164,7 @@ bool VoyeurEngine::doHeadTitle() {
 
 	if (_loadGameSlot == -1) {
 		// Show starting screen
-		if (_bVoy->getBoltGroup(0x500)) {
+		if (!getIsDemo() && _bVoy->getBoltGroup(0x500)) {
 			showConversionScreen();
 			_bVoy->freeBoltGroup(0x500);
 
@@ -179,11 +179,13 @@ bool VoyeurEngine::doHeadTitle() {
 				return false;
 		}
 
-		// Show the title screen
-		_eventsManager->getMouseInfo();
-		showTitleScreen();
-		if (shouldQuit())
-			return false;
+		if (!getIsDemo()) {
+			// Show the title screen
+			_eventsManager->getMouseInfo();
+			showTitleScreen();
+			if (shouldQuit())
+				return false;
+		}
 
 		// Opening
 		_eventsManager->getMouseInfo();