diff options
| author | Torbjörn Andersson | 2005-10-22 12:47:09 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2005-10-22 12:47:09 +0000 |
| commit | f8981765e924ecd632a99072287af7254eb9c4fc (patch) | |
| tree | a5979f060e4802944c5613be746d3395aaa3a95a /saga/scene.cpp | |
| parent | eeee881514cec76ed3a8f9e47ec2e89c0d408797 (diff) | |
| download | scummvm-rg350-f8981765e924ecd632a99072287af7254eb9c4fc.tar.gz scummvm-rg350-f8981765e924ecd632a99072287af7254eb9c4fc.tar.bz2 scummvm-rg350-f8981765e924ecd632a99072287af7254eb9c4fc.zip | |
Cleaned up some cursor show/hide handling. This should fix bug #1333391.
svn-id: r19239
Diffstat (limited to 'saga/scene.cpp')
| -rw-r--r-- | saga/scene.cpp | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/saga/scene.cpp b/saga/scene.cpp index be9ed9de4b..c273941f6c 100644 --- a/saga/scene.cpp +++ b/saga/scene.cpp @@ -843,16 +843,6 @@ void Scene::loadScene(LoadSceneParams *loadSceneParams) { _vm->_events->queue(&event); - if (getFlags() & kSceneFlagShowCursor) { - // Activate user interface - event.type = kEvTOneshot; - event.code = kInterfaceEvent; - event.op = kEventActivate; - event.time = 0; - - _vm->_events->queue(&event); - } - // Begin palette cycle animation if present event.type = kEvTOneshot; event.code = kPalAnimEvent; @@ -861,12 +851,6 @@ void Scene::loadScene(LoadSceneParams *loadSceneParams) { q_event = _vm->_events->queue(&event); - // Show cursor - event.type = kEvTOneshot; - event.code = kCursorEvent; - event.op = kEventShow; - _vm->_events->chain(q_event, &event); - // Start the scene main script if (_sceneDescription.sceneScriptEntrypointNumber > 0) { event.type = kEvTOneshot; @@ -899,9 +883,14 @@ void Scene::loadScene(LoadSceneParams *loadSceneParams) { if (_sceneNumber == ITE_SCENE_PUZZLE) _vm->_puzzle->execute(); - if (_sceneDescription.flags & kSceneFlagShowCursor) - _vm->_interface->activate(); - + if (getFlags() & kSceneFlagShowCursor) { + // Activate user interface + event.type = kEvTOneshot; + event.code = kInterfaceEvent; + event.op = kEventActivate; + event.time = 0; + _vm->_events->queue(&event); + } } void Scene::loadSceneDescriptor(uint32 resourceId) { |