diff options
| author | Andrew Kurushin | 2005-07-06 17:51:41 +0000 |
|---|---|---|
| committer | Andrew Kurushin | 2005-07-06 17:51:41 +0000 |
| commit | 8294d21739aa42f8ac0273b10504cc52e394f64d (patch) | |
| tree | 043e75c13ffe729c18d159362ec7ada8433ac66d | |
| parent | cff8568562ccf8f77f2b03323973c9dc5a3a1551 (diff) | |
| download | scummvm-rg350-8294d21739aa42f8ac0273b10504cc52e394f64d.tar.gz scummvm-rg350-8294d21739aa42f8ac0273b10504cc52e394f64d.tar.bz2 scummvm-rg350-8294d21739aa42f8ac0273b10504cc52e394f64d.zip | |
fix end sequence - show inventory bug during converse
svn-id: r18503
| -rw-r--r-- | saga/scene.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/saga/scene.cpp b/saga/scene.cpp index df04853769..a050d76d87 100644 --- a/saga/scene.cpp +++ b/saga/scene.cpp @@ -489,6 +489,9 @@ void Scene::loadScene(LoadSceneParams *loadSceneParams) { event.data = current_pal; q_event = _vm->_events->queue(&event); + //FIXME: do we really need two interface activation on load scene? + // i guess kTransitionFadeNoInterface should gone + /* if (loadSceneParams->transitionType != kTransitionFadeNoInterface) { // Activate user interface event.type = IMMEDIATE_EVENT; @@ -497,7 +500,7 @@ void Scene::loadScene(LoadSceneParams *loadSceneParams) { event.time = 0; event.duration = 0; q_event = _vm->_events->chain(q_event, &event); - } + }*/ // set fade mode event.type = IMMEDIATE_EVENT; @@ -604,13 +607,15 @@ void Scene::loadScene(LoadSceneParams *loadSceneParams) { _vm->_events->queue(&event); - // Activate user interface - event.type = ONESHOT_EVENT; - event.code = INTERFACE_EVENT; - event.op = EVENT_ACTIVATE; - event.time = 0; + if (getFlags() & kSceneFlagShowCursor) { + // Activate user interface + event.type = ONESHOT_EVENT; + event.code = INTERFACE_EVENT; + event.op = EVENT_ACTIVATE; + event.time = 0; - _vm->_events->queue(&event); + _vm->_events->queue(&event); + } // Begin palette cycle animation if present event.type = ONESHOT_EVENT; |