From 1f81f61cf9c6dffe5918f293627f7b8fa34be1cd Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 10 May 2015 19:14:55 +0200
Subject: SHERLOCK: Add some code for the interactive demo (still crashing)

---
 engines/sherlock/scalpel/scalpel.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'engines/sherlock/scalpel')

diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 0b7a9be278..8dc75c034f 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -215,9 +215,11 @@ void ScalpelEngine::initialize() {
 	_flags[3] = true;		// Turn on Alley
 	_flags[39] = true;		// Turn on Baker Street
 
+	if (!getIsDemo()) {
 	// Load the map co-ordinates for each scene and sequence data
 	_map->loadPoints(NUM_PLACES, &MAP_X[0], &MAP_Y[0], &MAP_TRANSLATE[0]);
 	_map->loadSequences(3, &MAP_SEQUENCES[0][0]);
+	}
 
 	// Load the inventory
 	loadInventory();
@@ -226,13 +228,19 @@ void ScalpelEngine::initialize() {
 	_talk->setSequences(&TALK_SEQUENCES[0][0], &STILL_SEQUENCES[0][0], MAX_PEOPLE);
 
 	// Starting scene
-	_scene->_goToScene = 4;
+	if (getIsDemo())
+		_scene->_goToScene = 3;
+	else
+		_scene->_goToScene = 4;
 }
 
 /**
  * Show the opening sequence
  */
 void ScalpelEngine::showOpening() {
+	if (getIsDemo())
+		return;
+
 	if (!showCityCutscene())
 		return;
 	if (!showAlleyCutscene())
-- 
cgit v1.2.3