diff options
| author | Paul Gilbert | 2016-07-31 17:43:27 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-31 17:43:27 -0400 |
| commit | 1e806a885b089034835d2481ad9ea71ef580c04e (patch) | |
| tree | bb1d5048fab959c868b608ba23d7f295efee77a5 | |
| parent | 9d3a2c1c7f9365f65908f583e62047830f60693d (diff) | |
| download | scummvm-rg350-1e806a885b089034835d2481ad9ea71ef580c04e.tar.gz scummvm-rg350-1e806a885b089034835d2481ad9ea71ef580c04e.tar.bz2 scummvm-rg350-1e806a885b089034835d2481ad9ea71ef580c04e.zip | |
TITANIC: Syntax fixes pointed out by criezy
| -rw-r--r-- | engines/titanic/support/movie.cpp | 4 | ||||
| -rw-r--r-- | engines/titanic/support/movie_range_info.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/titanic/support/movie.cpp b/engines/titanic/support/movie.cpp index 3c935e83a8..2784bda4b0 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 634ab1cc62..d4d9fc0e2a 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; } |