SHERLOCK: Fix non-interactive Scalpel demo

2 files changed, 11 insertions, 5 deletions

diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index a02a06cafc..b238605e13 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 f9ec8bb1bb..69ab6ecb6b 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;