diff options
| author | Torbjörn Andersson | 2005-01-02 15:59:01 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2005-01-02 15:59:01 +0000 |
| commit | 080483109a893d9d02c3eb5ed65f7f5895554178 (patch) | |
| tree | 04538b3f53c3447bc4ab4cdc0ea71cfb7ca09c75 | |
| parent | b944ad808bb7f596a1877838e03eb3d928324578 (diff) | |
| download | scummvm-rg350-080483109a893d9d02c3eb5ed65f7f5895554178.tar.gz scummvm-rg350-080483109a893d9d02c3eb5ed65f7f5895554178.tar.bz2 scummvm-rg350-080483109a893d9d02c3eb5ed65f7f5895554178.zip | |
Start intro animations with events to prevent the first frame from being
drawn too early. (Scorry still shows up too early, though.)
svn-id: r16411
| -rw-r--r-- | saga/ite_introproc.cpp | 48 |
1 files changed, 36 insertions, 12 deletions
diff --git a/saga/ite_introproc.cpp b/saga/ite_introproc.cpp index c17cee2b71..1580d4b9d1 100644 --- a/saga/ite_introproc.cpp +++ b/saga/ite_introproc.cpp @@ -173,6 +173,7 @@ int Scene::SC_ITEIntroAnimProc(int param, SCENE_INFO *scene_info, void *refCon) // Handles the introductory Dreamer's Guild / NWC logo animation scene. int Scene::ITEIntroAnimProc(int param, SCENE_INFO *scene_info) { EVENT event; + EVENT *q_event; switch (param) { case SCENE_BEGIN: @@ -185,7 +186,7 @@ int Scene::ITEIntroAnimProc(int param, SCENE_INFO *scene_info) { event.param = SET_PALETTE; event.time = 0; - _vm->_events->queue(&event); + q_event = _vm->_events->queue(&event); debug(0, "Intro animation procedure started."); debug(0, "Linking animation resources..."); @@ -209,9 +210,14 @@ int Scene::ITEIntroAnimProc(int param, SCENE_INFO *scene_info) { _vm->_anim->setFlag(6, ANIM_ENDSCENE); } - debug(0, "Beginning animation playback."); + // Begin the animation + event.type = ONESHOT_EVENT; + event.code = ANIM_EVENT; + event.op = EVENT_PLAY; + event.param = 0; + event.time = 0; - _vm->_anim->play(0, 0); + q_event = _vm->_events->chain(q_event, &event); // Queue intro music playback event.type = ONESHOT_EVENT; @@ -221,7 +227,7 @@ int Scene::ITEIntroAnimProc(int param, SCENE_INFO *scene_info) { event.op = EVENT_PLAY; event.time = 0; - _vm->_events->queue(&event); + q_event = _vm->_events->chain(q_event, &event); break; case SCENE_END: break; @@ -659,11 +665,16 @@ int Scene::ITEIntroValleyProc(int param, SCENE_INFO *scene_info) { switch (param) { case SCENE_BEGIN: - debug(0, "Beginning animation playback."); - // Begin title screen background animation _vm->_anim->setCycles(0, -1); - _vm->_anim->play(0, kNormalFadeDuration); + + event.type = ONESHOT_EVENT; + event.code = ANIM_EVENT; + event.op = EVENT_PLAY; + event.param = 0; + event.time = 0; + + q_event = _vm->_events->queue(&event); // Begin ITE title theme music _vm->_music->stop(); @@ -674,9 +685,9 @@ int Scene::ITEIntroValleyProc(int param, SCENE_INFO *scene_info) { event.param2 = 0; event.op = EVENT_PLAY; event.time = 0; - - q_event = _vm->_events->queue(&event); + q_event = _vm->_events->chain(q_event, &event); + // Pause animation before logo event.type = ONESHOT_EVENT; event.code = ANIM_EVENT; @@ -821,7 +832,14 @@ int Scene::ITEIntroTreeHouseProc(int param, SCENE_INFO *scene_info) { // Begin title screen background animation _vm->_anim->setFrameTime(0, 100); - _vm->_anim->play(0, event_delay); + + event.type = ONESHOT_EVENT; + event.code = ANIM_EVENT; + event.op = EVENT_PLAY; + event.param = 0; + event.time = 0; + + q_event = _vm->_events->chain(q_event, &event); // Queue game credits list text_entry.color = 255; @@ -920,7 +938,6 @@ int Scene::ITEIntroFairePathProc(int param, SCENE_INFO *scene_info) { switch (param) { case SCENE_BEGIN: - // Start 'dissolve' transition to new scene background event.type = CONTINUOUS_EVENT; event.code = TRANSITION_EVENT; @@ -934,7 +951,14 @@ int Scene::ITEIntroFairePathProc(int param, SCENE_INFO *scene_info) { // Begin title screen background animation _vm->_anim->setCycles(0, -1); - _vm->_anim->play(0, event_delay); + + event.type = ONESHOT_EVENT; + event.code = ANIM_EVENT; + event.op = EVENT_PLAY; + event.param = 0; + event.time = 0; + + q_event = _vm->_events->chain(q_event, &event); // Queue game credits list text_entry.color = 255; |