[Scummvm-git-logs] scummvm master -> 37e4ca3fbcf1bb6524d8d64b9e81a8c72466a157

[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:
37e4ca3fbc TITANIC: Fix doubling the size of half size video clips


Commit: 37e4ca3fbcf1bb6524d8d64b9e81a8c72466a157
    https://github.com/scummvm/scummvm/commit/37e4ca3fbcf1bb6524d8d64b9e81a8c72466a157
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-04T21:56:09-04:00

Commit Message:
TITANIC: Fix doubling the size of half size video clips

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



diff --git a/engines/titanic/support/movie.cpp b/engines/titanic/support/movie.cpp
index 2115906..949ed62 100644
--- a/engines/titanic/support/movie.cpp
+++ b/engines/titanic/support/movie.cpp
@@ -126,19 +126,12 @@ void OSMovie::playCutscene(const Rect &drawRect, uint startFrame, uint endFrame)
 	if (!_movieSurface)
 		_movieSurface = CScreenManager::_screenManagerPtr->createSurface(600, 340);
 
-	bool widthLess = _videoSurface->getWidth() < 600;
-	bool heightLess = _videoSurface->getHeight() < 340;
-	Rect r(drawRect.left, drawRect.top,
-		drawRect.left + (widthLess ? CLIP_WIDTH_REDUCED : CLIP_WIDTH),
-		drawRect.top + (heightLess ? CLIP_HEIGHT_REDUCED : CLIP_HEIGHT)
-	);
-
 	// Set a new event target whilst the clip plays, so standard scene drawing isn't called
 	CEventTarget eventTarget;
 	g_vm->_events->addTarget(&eventTarget);
 
 	_aviSurface.setFrame(startFrame);
-	_aviSurface.playCutscene(r, startFrame, endFrame);
+	_aviSurface.playCutscene(drawRect, startFrame, endFrame);
 
 	g_vm->_events->removeTarget();
 }