aboutsummaryrefslogtreecommitdiff
path: root/saga
diff options
context:
space:
mode:
authorTorbjörn Andersson2005-01-02 16:11:19 +0000
committerTorbjörn Andersson2005-01-02 16:11:19 +0000
commitfc6d4e0831fbefadb1c9bd61032f7d5be2f38d92 (patch)
tree8b2b278273401534b7dc3b9b01e8a1beab15642c /saga
parent080483109a893d9d02c3eb5ed65f7f5895554178 (diff)
downloadscummvm-rg350-fc6d4e0831fbefadb1c9bd61032f7d5be2f38d92.tar.gz
scummvm-rg350-fc6d4e0831fbefadb1c9bd61032f7d5be2f38d92.tar.bz2
scummvm-rg350-fc6d4e0831fbefadb1c9bd61032f7d5be2f38d92.zip
Use events to start the remaining animations. It's not necessary, but it's
more consistent that way. svn-id: r16412
Diffstat (limited to 'saga')
-rw-r--r--saga/ihnm_introproc.cpp27
1 files changed, 17 insertions, 10 deletions
diff --git a/saga/ihnm_introproc.cpp b/saga/ihnm_introproc.cpp
index c14dd174ce..919169754c 100644
--- a/saga/ihnm_introproc.cpp
+++ b/saga/ihnm_introproc.cpp
@@ -140,7 +140,14 @@ int Scene::IHNMIntroMovieProc1(int param, SCENE_INFO *scene_info) {
_vm->_anim->setFrameTime(0, IHNM_INTRO_FRAMETIME);
_vm->_anim->setFlag(0, ANIM_ENDSCENE);
- _vm->_anim->play(0, 0);
+
+ 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);
break;
default:
break;
@@ -186,10 +193,6 @@ int Scene::IHNMIntroMovieProc2(int param, SCENE_INFO *scene_info) {
_vm->_anim->setCycles(0, -1);
- // The "Dreamer's Guild" animation has to be started by an
- // event, or the first frame will be drawn before the palette
- // fades down.
- //
// Unlike the original, we keep the logo spinning during the
// palette fades. We don't have to, but I think it looks better
// that way.
@@ -275,7 +278,7 @@ int Scene::IHNMIntroMovieProc3(int param, SCENE_INFO *scene_info) {
event.op = EVENT_PLAY;
event.time = 0;
- q_event = _vm->_events->queue(&event);
+ q_event = _vm->_events->chain(q_event, &event);
// Background for intro scene is the first frame of the intro
// animation; display it but don't set palette
@@ -299,7 +302,13 @@ int Scene::IHNMIntroMovieProc3(int param, SCENE_INFO *scene_info) {
q_event = _vm->_events->chain(q_event, &event);
- _vm->_anim->play(0, 0);
+ 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 end of scene after a while
// TODO: I've increased the delay so the speech won't start
@@ -331,9 +340,7 @@ int Scene::IHNMHateProc(int param, SCENE_INFO *scene_info) {
case SCENE_BEGIN:
_vm->_anim->setCycles(0, -1);
- // The "hate" animation also needs to be started from an event,
- // or the first frame will be drawn too early.
-
+ // Start "hate" animation
event.type = ONESHOT_EVENT;
event.code = ANIM_EVENT;
event.op = EVENT_PLAY;