[Scummvm-cvs-logs] scummvm master -> 0dc9a46bbe39b524de5d80c131f598f797263d12

dreammaster dreammaster at scummvm.org
Thu Oct 8 02:53:08 CEST 2015


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:
0dc9a46bbe SHERLOCK: SS: Fix Holmes character re-appearing in Lab Table scene


Commit: 0dc9a46bbe39b524de5d80c131f598f797263d12
    https://github.com/scummvm/scummvm/commit/0dc9a46bbe39b524de5d80c131f598f797263d12
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-10-07T20:52:43-04:00

Commit Message:
SHERLOCK: SS: Fix Holmes character re-appearing in Lab Table scene

Changed paths:
    engines/sherlock/scalpel/scalpel_scene.cpp



diff --git a/engines/sherlock/scalpel/scalpel_scene.cpp b/engines/sherlock/scalpel/scalpel_scene.cpp
index b2c7339..52dc621 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);






More information about the Scummvm-git-logs mailing list