[Scummvm-cvs-logs] scummvm master -> 1e806a885b089034835d2481ad9ea71ef580c04e

[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:
1e806a885b TITANIC: Syntax fixes pointed out by criezy


Commit: 1e806a885b089034835d2481ad9ea71ef580c04e
    https://github.com/scummvm/scummvm/commit/1e806a885b089034835d2481ad9ea71ef580c04e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-07-31T17:43:27-04:00

Commit Message:
TITANIC: Syntax fixes pointed out by criezy

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



diff --git a/engines/titanic/support/movie.cpp b/engines/titanic/support/movie.cpp
index 3c935e8..2784bda 100644
--- a/engines/titanic/support/movie.cpp
+++ b/engines/titanic/support/movie.cpp
@@ -129,8 +129,8 @@ void OSMovie::playClip(const Point &drawPos, uint startFrame, uint endFrame) {
 	bool widthLess = _videoSurface->getWidth() < 600;
 	bool heightLess = _videoSurface->getHeight() < 340;
 	Rect r(drawPos.x, drawPos.y,
-		drawPos.x + widthLess ? CLIP_WIDTH_REDUCED : CLIP_WIDTH,
-		drawPos.y + heightLess ? CLIP_HEIGHT_REDUCED : CLIP_HEIGHT
+		drawPos.x + (widthLess ? CLIP_WIDTH_REDUCED : CLIP_WIDTH),
+		drawPos.y + (heightLess ? CLIP_HEIGHT_REDUCED : CLIP_HEIGHT)
 	);
 
 	uint timePerFrame = 1000 / _aviSurface._frameRate;
diff --git a/engines/titanic/support/movie_range_info.cpp b/engines/titanic/support/movie_range_info.cpp
index 634ab1c..d4d9fc0 100644
--- a/engines/titanic/support/movie_range_info.cpp
+++ b/engines/titanic/support/movie_range_info.cpp
@@ -94,7 +94,7 @@ void CMovieRangeInfo::process(CGameObject *owner) {
 	
 	for (CMovieEventList::iterator i = _events.begin(); i != _events.end(); ++i) {
 		CMovieEvent *movieEvent = *i;
-		if (!movieEvent->_type == MET_PLAY) {
+		if (movieEvent->_type == MET_MOVIE_END) {
 			flags |= CLIPFLAG_PLAY;
 			break;
 		}