libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-24 10:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PEGASUS: Don't allow for seeking beyond the ends of the movie

Browse Source
This commit is contained in:
Matthew Hoops 2011-09-22 10:53:53 -04:00
parent c88e33abd7
commit 2e9c7b5342
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
engines/pegasus/movie.cpp
View File

@ -81,6 +81,9 @@ void Movie::redrawMovieWorld() {
if (_video) {
const Graphics::Surface *frame = _video->decodeNextFrame();
if (!frame)
return;
if (_directDraw) {
// Copy to the screen
Common::Rect bounds;
@ -117,8 +120,16 @@ void Movie::setVolume(uint16 volume) {
void Movie::setTime(const TimeValue time, const TimeScale scale) {
if (_video) {
_video->seekToTime(Audio::Timestamp(0, time, ((scale == 0) ? getScale() : scale)));
_time = Common::Rational(time, ((scale == 0) ? getScale() : scale));
// Don't go past the ends of the movie
Common::Rational timeFrac = Common::Rational(time, ((scale == 0) ? getScale() : scale));
if (timeFrac < Common::Rational(_startTime, _startScale))
timeFrac = Common::Rational(_startTime, _startScale);
else if (timeFrac >= Common::Rational(_stopTime, _stopScale))
return;
_video->seekToTime(Audio::Timestamp(0, timeFrac.getNumerator(), timeFrac.getDenominator()));
_time = timeFrac;
}
}