aboutsummaryrefslogtreecommitdiff
path: root/engines/director/score.cpp
diff options
context:
space:
mode:
authorTobia Tesan2017-06-21 10:53:37 +0200
committerEugene Sandulenko2017-07-05 08:35:33 +0200
commit1d5c92783e2803d4db4c504ec87c327007c0f8a7 (patch)
treee87e4a89dee755fc5372e45545a1772e746be39a /engines/director/score.cpp
parentfd310f1fd3b8336b7c9a2b771153e22a006a4e52 (diff)
downloadscummvm-rg350-1d5c92783e2803d4db4c504ec87c327007c0f8a7.tar.gz
scummvm-rg350-1d5c92783e2803d4db4c504ec87c327007c0f8a7.tar.bz2
scummvm-rg350-1d5c92783e2803d4db4c504ec87c327007c0f8a7.zip
DIRECTOR: Add processSpriteEvent
Diffstat (limited to 'engines/director/score.cpp')
-rw-r--r--engines/director/score.cpp15
1 files changed, 4 insertions, 11 deletions
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index e5430542d3..29be599573 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -1183,19 +1183,12 @@ void Score::update() {
_lingo->processEvent(kEventNone, kFrameScript, _frames[_currentFrame]->_actionId);
// TODO Director 6 - another order
- // TODO Director 6 step: send beginSprite event to any sprites whose span begin in the upcoming frame
if (_vm->getVersion() >= 6) {
- for (uint16 i = 0; i < CHANNEL_COUNT; i++) {
- if (_frames[_currentFrame]->_sprites[i]->_enabled) {
- // TODO: Check if this is also possibly a kSpriteScript?
- _lingo->processEvent(kEventBeginSprite, kCastScript, _frames[_currentFrame]->_sprites[i]->_scriptId);
- }
- }
- }
-
- // TODO: Director 6 step: send prepareFrame event to all sprites and the script channel in upcoming frame
- if (_vm->getVersion() >= 6)
+ _lingo->processEvent(kEventBeginSprite);
+ // TODO Director 6 step: send beginSprite event to any sprites whose span begin in the upcoming frame
_lingo->processEvent(kEventPrepareFrame);
+ // TODO: Director 6 step: send prepareFrame event to all sprites and the script channel in upcoming frame
+ }
Common::SortedArray<Label *>::iterator i;
if (_labels != NULL) {