[Scummvm-cvs-logs] scummvm master -> fcbf84455ea3ced2335fbcb4b6b44f99d4232f28

dreammaster dreammaster at scummvm.org
Sun Sep 13 22:47:01 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:
fcbf84455e SHERLOCK: 3DO: Fix refreshing scene after showing portrait video


Commit: fcbf84455ea3ced2335fbcb4b6b44f99d4232f28
    https://github.com/scummvm/scummvm/commit/fcbf84455ea3ced2335fbcb4b6b44f99d4232f28
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-09-13T16:46:22-04:00

Commit Message:
SHERLOCK: 3DO: Fix refreshing scene after showing portrait video

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



diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 9019dc0..ebf4cde 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -1264,6 +1264,7 @@ void ScalpelEngine::showScummVMRestoreDialog() {
 }
 
 bool ScalpelEngine::play3doMovie(const Common::String &filename, const Common::Point &pos, bool halfSize) {
+	Scalpel3DOScreen &screen = *(Scalpel3DOScreen *)_screen;
 	Scalpel3DOMovieDecoder *videoDecoder = new Scalpel3DOMovieDecoder();
 	Graphics::Surface tempSurface;
 
@@ -1277,8 +1278,6 @@ bool ScalpelEngine::play3doMovie(const Common::String &filename, const Common::P
 		return false;
 	}
 
-	_screen->_backBuffer1.blitFrom(*_screen); // save into backbuffer 1
-
 	if (halfSize) {
 		// only for portrait videos, not for EA intro logo and such
 		if ((framePos.x >= 8) && (framePos.y >= 8)) { // safety check
@@ -1413,7 +1412,10 @@ bool ScalpelEngine::play3doMovie(const Common::String &filename, const Common::P
 		delete frameImage;
 	}
 
-	_screen->blitFrom(_screen->_backBuffer1);
+	// Restore scene
+	screen._backBuffer1.blitFrom(screen._backBuffer2);
+	_scene->updateBackground();
+	screen.slamArea(0, 0, screen.w(), CONTROLS_Y);
 
 	return !skipVideo;
 }






More information about the Scummvm-git-logs mailing list