[Scummvm-git-logs] scummvm master -> ba00661b3a531834e6f7d648144996540539573c

[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:
ba00661b3a SHERLOCK: Speed up other cutscenes to better match the original


Commit: ba00661b3a531834e6f7d648144996540539573c
    https://github.com/scummvm/scummvm/commit/ba00661b3a531834e6f7d648144996540539573c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-12-17T21:50:56-08:00

Commit Message:
SHERLOCK: Speed up other cutscenes to better match the original

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


diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index dd03c04..676c6f4 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -1052,8 +1052,8 @@ void ScalpelEngine::startScene() {
 			_res->addToCache("finale4.vda", "EPILOG2.lib");
 			_res->addToCache("finale4.vdx", "EPILOG2.lib");
 
-			_animation->play("finalr1", false, 1, 3, true, 4);
-			_animation->play("finalr2", false, 1, 0, false, 4);
+			_animation->play("finalr1", false, 1, 3, true, 2);
+			_animation->play("finalr2", false, 1, 0, false, 2);
 
 			if (!_res->isInCache("finale2.vda")) {
 				// Finale file isn't cached
@@ -1065,12 +1065,12 @@ void ScalpelEngine::startScene() {
 				_res->addToCache("finale4.vdx", "EPILOG2.lib");
 			}
 
-			_animation->play("finale1", false, 1, 0, false, 4);
-			_animation->play("finale2", false, 1, 0, false, 4);
-			_animation->play("finale3", false, 1, 0, false, 4);
+			_animation->play("finale1", false, 1, 0, false, 2);
+			_animation->play("finale2", false, 1, 0, false, 2);
+			_animation->play("finale3", false, 1, 0, false, 2);
 
 			_useEpilogue2 = true;
-			_animation->play("finale4", false, 1, 0, false, 4);
+			_animation->play("finale4", false, 1, 0, false, 2);
 			_useEpilogue2 = false;
 			break;
 
@@ -1081,9 +1081,9 @@ void ScalpelEngine::startScene() {
 			_res->addToCache("SUBWAY3.vda", "epilogue.lib");
 			_res->addToCache("SUBWAY3.vdx", "epilogue.lib");
 
-			_animation->play("SUBWAY1", false, 1, 3, true, 4);
-			_animation->play("SUBWAY2", false, 1, 0, false, 4);
-			_animation->play("SUBWAY3", false, 1, 0, false, 4);
+			_animation->play("SUBWAY1", false, 1, 3, true, 2);
+			_animation->play("SUBWAY2", false, 1, 0, false, 2);
+			_animation->play("SUBWAY3", false, 1, 0, false, 2);
 
 			// Set fading to direct fade temporary so the transition goes quickly.
 			_scene->_tempFadeStyle = _screen->_fadeStyle ? 257 : 256;
@@ -1092,7 +1092,7 @@ void ScalpelEngine::startScene() {
 
 		case BRUMWELL_SUICIDE:
 			// Brumwell suicide
-			_animation->play("suicid", false, 1, 3, true, 4);
+			_animation->play("suicid", false, 1, 3, true, 2);
 			break;
 		default:
 			break;