diff options
| author | Matthew Hoops | 2012-05-25 00:21:51 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-05-25 00:35:38 -0400 |
| commit | f1f6a82cd57fceb52afdd393f44a80c40f3c9a15 (patch) | |
| tree | 06a04072df44bd5f337ff79b43684d8109a72f59 /engines/pegasus | |
| parent | b2506abccf6aa64da31b497b45fe0e1949530053 (diff) | |
| parent | beef27fc10bb714fe37f2ee0c35cd143dc706829 (diff) | |
| download | scummvm-rg350-f1f6a82cd57fceb52afdd393f44a80c40f3c9a15.tar.gz scummvm-rg350-f1f6a82cd57fceb52afdd393f44a80c40f3c9a15.tar.bz2 scummvm-rg350-f1f6a82cd57fceb52afdd393f44a80c40f3c9a15.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/pegasus')
| -rw-r--r-- | engines/pegasus/movie.cpp | 2 | ||||
| -rw-r--r-- | engines/pegasus/pegasus.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/pegasus/movie.cpp b/engines/pegasus/movie.cpp index 9a13864cab..f4aa9eecee 100644 --- a/engines/pegasus/movie.cpp +++ b/engines/pegasus/movie.cpp @@ -198,7 +198,7 @@ void Movie::updateTime() { uint32 startTime = _startTime * getScale() / _startScale; uint32 stopTime = _stopTime * getScale() / _stopScale; - uint32 actualTime = CLIP<int>(_video->getElapsedTime() * getScale() / 1000, startTime, stopTime); + uint32 actualTime = CLIP<int>(_video->getTime() * getScale() / 1000, startTime, stopTime); _time = Common::Rational(actualTime, getScale()); } } diff --git a/engines/pegasus/pegasus.cpp b/engines/pegasus/pegasus.cpp index 701c4161bb..1665b474ee 100644 --- a/engines/pegasus/pegasus.cpp +++ b/engines/pegasus/pegasus.cpp @@ -2093,7 +2093,7 @@ void PegasusEngine::doSubChase() { if (!video->loadFile("Images/Norad Alpha/Sub Chase Movie")) error("Failed to load sub chase"); - while (!shouldQuit() && !video->endOfVideo() && video->getElapsedTime() < endTime) { + while (!shouldQuit() && !video->endOfVideo() && video->getTime() < endTime) { if (video->needsUpdate()) { const Graphics::Surface *frame = video->decodeNextFrame(); |