[Scummvm-git-logs] scummvm master -> 679c0e72b146a72340fd6b2ae5aac157831bae13

dreammaster dreammaster at scummvm.org
Mon Jul 17 00:33:45 CEST 2017


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:
679c0e72b1 TITANIC: Fix scaling in scene transition cutscenes


Commit: 679c0e72b146a72340fd6b2ae5aac157831bae13
    https://github.com/scummvm/scummvm/commit/679c0e72b146a72340fd6b2ae5aac157831bae13
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-07-16T18:33:36-04:00

Commit Message:
TITANIC: Fix scaling in scene transition cutscenes

Changed paths:
    engines/titanic/support/avi_surface.cpp


diff --git a/engines/titanic/support/avi_surface.cpp b/engines/titanic/support/avi_surface.cpp
index 11b6b68..b14d962 100644
--- a/engines/titanic/support/avi_surface.cpp
+++ b/engines/titanic/support/avi_surface.cpp
@@ -477,9 +477,6 @@ void AVISurface::playCutscene(const Rect &r, uint startFrame, uint endFrame) {
 	if (_currentFrame != ((int)startFrame - 1) || startFrame == 0) {
 		// Start video playback at the desired starting frame
 		setFrame(startFrame);
-		isDifferent = _movieFrameSurface[0]->w != r.width() ||
-			_movieFrameSurface[0]->h != r.height();
-
 		startAtFrame(startFrame);
 		_currentFrame = startFrame;
 	} else {
@@ -487,6 +484,9 @@ void AVISurface::playCutscene(const Rect &r, uint startFrame, uint endFrame) {
 		_decoder->start();
 	}
 
+	isDifferent = _movieFrameSurface[0]->w != r.width() ||
+		_movieFrameSurface[0]->h != r.height();
+
 	while (_currentFrame < (int)endFrame && !g_vm->shouldQuit()) {
 		if (isNextFrame()) {
 			renderFrame();





More information about the Scummvm-git-logs mailing list