[Scummvm-cvs-logs] scummvm master -> 09ebdfcd113ef44c98cc2b138d979b03ecb4656b

[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:
09ebdfcd11 SHERLOCK: Fix non-interactive Scalpel demo


Commit: 09ebdfcd113ef44c98cc2b138d979b03ecb4656b
    https://github.com/scummvm/scummvm/commit/09ebdfcd113ef44c98cc2b138d979b03ecb4656b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-05-30T11:42:21-04:00

Commit Message:
SHERLOCK: Fix non-interactive Scalpel demo

Changed paths:
    engines/sherlock/events.cpp
    engines/sherlock/scalpel/scalpel_user_interface.cpp



diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index a02a06c..b238605 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -32,8 +32,7 @@ namespace Sherlock {
 
 enum ButtonFlag { LEFT_BUTTON = 1, RIGHT_BUTTON = 2 };
 
-Events::Events(SherlockEngine *vm) {
-	_vm = vm;
+Events::Events(SherlockEngine *vm): _vm(vm) {
 	_cursorImages = nullptr;
 	_cursorId = INVALID_CURSOR;
 	_frameCounter = 1;
@@ -43,7 +42,8 @@ Events::Events(SherlockEngine *vm) {
 	_rightPressed = _rightReleased = false;
 	_oldButtons = _oldRightButton = false;
 
-	loadCursors("rmouse.vgs");
+	if (_vm->_interactiveFl)
+		loadCursors("rmouse.vgs");
 }
 
 Events::~Events() {
diff --git a/engines/sherlock/scalpel/scalpel_user_interface.cpp b/engines/sherlock/scalpel/scalpel_user_interface.cpp
index f9ec8bb..69ab6ec 100644
--- a/engines/sherlock/scalpel/scalpel_user_interface.cpp
+++ b/engines/sherlock/scalpel/scalpel_user_interface.cpp
@@ -84,8 +84,14 @@ const char *const MUSE[] = {
 
 
 ScalpelUserInterface::ScalpelUserInterface(SherlockEngine *vm): UserInterface(vm) {
-	_controls = new ImageFile("menu.all");
-	_controlPanel = new ImageFile("controls.vgs");
+	if (_vm->_interactiveFl) {
+		_controls = new ImageFile("menu.all");
+		_controlPanel = new ImageFile("controls.vgs");
+	} else {
+		_controls = nullptr;
+		_controlPanel = nullptr;
+	}
+
 	_keyPress = '\0';
 	_lookHelp = 0;
 	_bgFound = 0;