[Scummvm-cvs-logs] scummvm master -> 8ed2e75256a3bdf1b11a3d6296da3f1346a689a9

[eriktorbjorn]

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:
8ed2e75256 SHERLOCK: Roll credits for 3DO Serrated Scalpel


Commit: 8ed2e75256a3bdf1b11a3d6296da3f1346a689a9
    https://github.com/scummvm/scummvm/commit/8ed2e75256a3bdf1b11a3d6296da3f1346a689a9
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2015-06-14T22:52:41+02:00

Commit Message:
SHERLOCK: Roll credits for 3DO Serrated Scalpel

There's a missing "brighten the image" effect, and the speed of
the scrolling text may need some tuning. But it's a start.

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



diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 130d1b3..5268f7d 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -775,6 +775,29 @@ bool ScalpelEngine::showOfficeCutscene3DO() {
 	if (finished)
 		finished = _animation->play3DO("COFF4", true, 1, false, 3);
 
+	if (finished) {
+		finished = _music->waitUntilMSec(244500, 0, 0, 500);
+
+		// TODO: Brighten the image, possibly by doing a partial fade
+		// to white.
+
+		_screen->_backBuffer1.blitFrom(*_screen);
+
+		for (int nr = 1; finished && nr <= 4; nr++) {
+			char filename[15];
+			sprintf(filename, "credits%d.cel", nr);
+			ImageFile3DO *creditsImage = new ImageFile3DO(filename, kImageFile3DOType_Cel);
+			ImageFrame *creditsFrame = &(*creditsImage)[0];
+			for (int i = 0; finished && i < 200 + creditsFrame->_height; i++) {
+				_screen->blitFrom(_screen->_backBuffer1);
+				_screen->transBlitFrom(creditsFrame->_frame, Common::Point((320 - creditsFrame->_width) / 2, 200 - i));
+				if (!_events->delay(80, true))
+					finished = false;
+			}
+			delete creditsImage;
+		}
+	}
+
 	return finished;
 }