[Scummvm-cvs-logs] scummvm master -> 5a12026ae8e9c6d46c322c642c2a7a54a9b51c88

[m-kiewitz]

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:
5a12026ae8 SHERLOCK: 3DO: note about constable gfx glitch


Commit: 5a12026ae8e9c6d46c322c642c2a7a54a9b51c88
    https://github.com/scummvm/scummvm/commit/5a12026ae8e9c6d46c322c642c2a7a54a9b51c88
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-15T21:48:36+02:00

Commit Message:
SHERLOCK: 3DO: note about constable gfx glitch

+ get returns of 2 animation play calls

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



diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 95cf837..02ae21c 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -721,8 +721,14 @@ bool ScalpelEngine::showStreetCutscene3DO() {
 		finished = _music->waitUntilMSec(100300, 0, 0, 1000);
 	}
 
-	finished = _animation->play3DO("14KICK", true, 1, false, 2);
+	if (finished)
+		finished = _animation->play3DO("14KICK", true, 1, false, 2);
 
+	// note: part of the constable is sticking to the door during the following
+	//       animation, when he walks away. This is a bug of course, but it actually happened on 3DO!
+	//       I'm not sure if it happens because the door is pure black (0, 0, 0) and it's because
+	//       of transparency - or if the animation itself is bad. We will definitely have to adjust
+	//       the animation data to fix it.
 	if (finished)
 		finished = _animation->play3DO("14NOTE", true, 1, false, 3);
 
@@ -739,7 +745,7 @@ bool ScalpelEngine::showOfficeCutscene3DO() {
 	bool finished = _music->waitUntilMSec(151000, 0, 0, 1000);
 
 	if (finished)
-		_animation->play3DO("COFF1", true, 1, false, 3);
+		finished = _animation->play3DO("COFF1", true, 1, false, 3);
 
 	if (finished)
 		finished = _animation->play3DO("COFF2", true, 1, false, 3);