aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorDmitry Iskrich2016-06-04 22:24:30 +0300
committerEugene Sandulenko2016-08-03 23:40:36 +0200
commite17de45075f75cf9657764c31a7893dd73a1822f (patch)
tree8388cfbd4a841c6c676f392b701a00422c8bc469 /engines
parent14d0bb6844accf4cb3d840d5ff01c25298bd7483 (diff)
downloadscummvm-rg350-e17de45075f75cf9657764c31a7893dd73a1822f.tar.gz
scummvm-rg350-e17de45075f75cf9657764c31a7893dd73a1822f.tar.bz2
scummvm-rg350-e17de45075f75cf9657764c31a7893dd73a1822f.zip
DIRECTOR: Fix tempo channel parsing, add missed events
Diffstat (limited to 'engines')
-rw-r--r--engines/director/score.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 1e9ea191bc..d8d76ffb66 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -293,10 +293,18 @@ void Score::display() {
if (tempo > 161) {
//Delay
_nextFrameTime = g_system->getMillis() + (256 - tempo) * 1000;
- } else {
+ } else if (tempo <= 60) {
//FPS
_nextFrameTime = g_system->getMillis() + (float)tempo / 60 * 1000;
_currentFrameRate = tempo;
+ } else if (tempo >= 136) {
+ //TODO Wait for channel tempo - 135
+ } else if (tempo == 128) {
+ //TODO Wait for Click/Key
+ } else if (tempo == 135) {
+ //TODO Wait for sound channel 1
+ } else if (tempo == 134) {
+ //TODO Wait for sound channel 2
}
}
_nextFrameTime = g_system->getMillis() + (float)_currentFrameRate / 60 * 1000;