aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEugene Sandulenko2016-08-26 18:17:04 +0200
committerEugene Sandulenko2016-08-26 18:39:47 +0200
commit8a372eaf7169a67af984380e0204808da4feeee4 (patch)
tree489214997605d748b4777794f175dda87945d7e2 /engines
parent41ee7dd3717e8ff5451314fe62468ae64e8879c3 (diff)
downloadscummvm-rg350-8a372eaf7169a67af984380e0204808da4feeee4.tar.gz
scummvm-rg350-8a372eaf7169a67af984380e0204808da4feeee4.tar.bz2
scummvm-rg350-8a372eaf7169a67af984380e0204808da4feeee4.zip
DIRECTOR: Execute proper script on frames. This fixes the playback
Diffstat (limited to 'engines')
-rw-r--r--engines/director/frame.cpp2
-rw-r--r--engines/director/score.cpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index 55d5ebd672..0ede871da8 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -77,6 +77,8 @@ Frame::Frame(const Frame &frame) {
_blend = frame._blend;
_palette = new PaletteInfo();
+ debugC(1, kDebugLoading, "Frame. action: %d transType: %d transDuration: %d", _actionId, _transType, _transDuration);
+
_sprites.resize(CHANNEL_COUNT);
for (uint16 i = 0; i < CHANNEL_COUNT; i++) {
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index c07804b5a1..9dd8cd8ba2 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -752,8 +752,8 @@ void Score::update() {
_surface->copyFrom(*_trailSurface);
//Enter and exit from previous frame (Director 4)
- _lingo->processEvent(kEventEnterFrame, _currentFrame);
- _lingo->processEvent(kEventExitFrame, _currentFrame);
+ _lingo->processEvent(kEventEnterFrame, _frames[_currentFrame]->_actionId);
+ _lingo->processEvent(kEventExitFrame, _frames[_currentFrame]->_actionId);
//TODO Director 6 - another order