aboutsummaryrefslogtreecommitdiff
path: root/engines/lastexpress/data/animation.cpp
diff options
context:
space:
mode:
authorJulien Templier2010-11-19 10:55:21 +0000
committerJulien Templier2010-11-19 10:55:21 +0000
commit2a6519ca2e33298b43f410cad279eda6e0b10bb1 (patch)
tree0785031b5bfd07e6c1dff13c58aed7fc1a19e9a9 /engines/lastexpress/data/animation.cpp
parentc19e8377f9cc947f0110247af8ce5fb21c40e64e (diff)
downloadscummvm-rg350-2a6519ca2e33298b43f410cad279eda6e0b10bb1.tar.gz
scummvm-rg350-2a6519ca2e33298b43f410cad279eda6e0b10bb1.tar.bz2
scummvm-rg350-2a6519ca2e33298b43f410cad279eda6e0b10bb1.zip
LASTEXPRESS: Simplify current frame calculation in Animation::process
(per Max suggestion) svn-id: r54366
Diffstat (limited to 'engines/lastexpress/data/animation.cpp')
-rw-r--r--engines/lastexpress/data/animation.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/lastexpress/data/animation.cpp b/engines/lastexpress/data/animation.cpp
index f3179749c0..cc44d6869e 100644
--- a/engines/lastexpress/data/animation.cpp
+++ b/engines/lastexpress/data/animation.cpp
@@ -106,8 +106,11 @@ bool Animation::process() {
if (_stream == NULL || _chunks.size() == 0)
error("Trying to show an animation before loading data");
- // TODO: substract the time paused by the GUI
- int32 currentFrame = Common::Rational((g_engine->_system->getMillis() - _startTime) * 100, 3333).toInt();
+ // TODO: - subtract the time paused by the GUI
+ // - Re-implement to be closer to the original engine
+ // - Add support for subtitles
+ // - Use engine sound queue instead of our own appendable sound instance
+ int32 currentFrame = (g_engine->_system->getMillis() - _startTime) * 3 / 100;
// Process all chunks until the current frame
while (!_changed && _currentChunk != NULL && currentFrame > _currentChunk->frame && !hasEnded()) {