aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/scalpel
diff options
context:
space:
mode:
authorStrangerke2015-05-18 20:57:27 +0200
committerStrangerke2015-05-18 20:58:44 +0200
commitd82d476b277f80b69514fcb360ec47e9482e4a28 (patch)
treebde3a597531652edfb0c0acc5b94593ca2772327 /engines/sherlock/scalpel
parentb1b7ee33dfa3cf675f7c02daf825c0b0d277227d (diff)
downloadscummvm-rg350-d82d476b277f80b69514fcb360ec47e9482e4a28.tar.gz
scummvm-rg350-d82d476b277f80b69514fcb360ec47e9482e4a28.tar.bz2
scummvm-rg350-d82d476b277f80b69514fcb360ec47e9482e4a28.zip
SHERLOCK: Add code to make non-interactive demo completable
Diffstat (limited to 'engines/sherlock/scalpel')
-rw-r--r--engines/sherlock/scalpel/scalpel.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 6959e435d2..078677be65 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -251,9 +251,9 @@ void ScalpelEngine::initialize() {
_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 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
@@ -269,7 +269,7 @@ void ScalpelEngine::initialize() {
_animation->setTitleFrames(&TITLE_FRAMES[0][0], 7, 9);
// Starting scene
- if (getIsDemo())
+ if (getIsDemo() && _interactiveFl)
_scene->_goToScene = 3;
else
_scene->_goToScene = 4;
@@ -279,7 +279,7 @@ void ScalpelEngine::initialize() {
* Show the opening sequence
*/
void ScalpelEngine::showOpening() {
- if (getIsDemo())
+ if (getIsDemo() && _interactiveFl)
return;
if (!showCityCutscene())