From 0dc9a46bbe39b524de5d80c131f598f797263d12 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Wed, 7 Oct 2015 20:52:43 -0400 Subject: SHERLOCK: SS: Fix Holmes character re-appearing in Lab Table scene --- engines/sherlock/scalpel/scalpel_scene.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/sherlock') diff --git a/engines/sherlock/scalpel/scalpel_scene.cpp b/engines/sherlock/scalpel/scalpel_scene.cpp index b2c7339363..52dc621206 100644 --- a/engines/sherlock/scalpel/scalpel_scene.cpp +++ b/engines/sherlock/scalpel/scalpel_scene.cpp @@ -330,8 +330,8 @@ void ScalpelScene::doBgAnim() { } } - // Draw the person if not animating - if (people[HOLMES]._type == CHARACTER && people[HOLMES]._walkLoaded) { + // Draw the player if he's active and his walk has been loaded into memory + if (people[HOLMES]._type == CHARACTER && people[HOLMES]._walkLoaded && people._holmesOn) { // If Holmes is too far to the right, move him back so he's on-screen int xRight = SHERLOCK_SCREEN_WIDTH - 2 - people[HOLMES]._imageFrame->_frame.w; int tempX = MIN(people[HOLMES]._position.x / FIXED_INT_MULTIPLIER, xRight); -- cgit v1.2.3