diff options
| author | Eugene Sandulenko | 2007-05-07 06:18:08 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2007-05-07 06:18:08 +0000 |
| commit | 22e022cdcbaefe4a37921941f24094ebd87c082e (patch) | |
| tree | cb822ac7a38bab3cb680aabb63ca6f3ce27e334b | |
| parent | 3413dda0e9753703f58e51cff07b3220bd3b56cd (diff) | |
| download | scummvm-rg350-22e022cdcbaefe4a37921941f24094ebd87c082e.tar.gz scummvm-rg350-22e022cdcbaefe4a37921941f24094ebd87c082e.tar.bz2 scummvm-rg350-22e022cdcbaefe4a37921941f24094ebd87c082e.zip | |
Simplify cursor events management.
svn-id: r26772
| -rw-r--r-- | engines/saga/events.cpp | 7 | ||||
| -rw-r--r-- | engines/saga/scene.cpp | 24 |
2 files changed, 15 insertions, 16 deletions
diff --git a/engines/saga/events.cpp b/engines/saga/events.cpp index 7452f69b39..f58b17ca17 100644 --- a/engines/saga/events.cpp +++ b/engines/saga/events.cpp @@ -438,10 +438,13 @@ int Events::handleOneShot(Event *event) { _vm->_gfx->showCursor(false); break; case kEventSetNormalCursor: - _vm->_gfx->setCursor(kCursorNormal); + // in ITE there is just one cursor + if (_vm->getGameType() == GType_IHNM) + _vm->_gfx->setCursor(kCursorNormal); break; case kEventSetBusyCursor: - _vm->_gfx->setCursor(kCursorBusy); + if (_vm->getGameType() == GType_IHNM) + _vm->_gfx->setCursor(kCursorBusy); break; default: break; diff --git a/engines/saga/scene.cpp b/engines/saga/scene.cpp index 94f81c8ba3..a3c6e375b0 100644 --- a/engines/saga/scene.cpp +++ b/engines/saga/scene.cpp @@ -596,13 +596,11 @@ void Scene::loadScene(LoadSceneParams *loadSceneParams) { static PalEntry current_pal[PAL_ENTRIES]; // Change the cursor to an hourglass in IHNM - if (_vm->getGameType() == GType_IHNM) { - event.type = kEvTOneshot; - event.code = kCursorEvent; - event.op = kEventSetBusyCursor; - event.time = 0; - _vm->_events->queue(&event); - } + event.type = kEvTOneshot; + event.code = kCursorEvent; + event.op = kEventSetBusyCursor; + event.time = 0; + _vm->_events->queue(&event); if ((_vm->getGameType() == GType_IHNM) && (loadSceneParams->chapter != NO_CHAPTER_CHANGE)) { if (loadSceneParams->loadFlag != kLoadBySceneNumber) { @@ -901,13 +899,11 @@ void Scene::loadScene(LoadSceneParams *loadSceneParams) { } // Change the cursor back to a crosshair in IHNM - if (_vm->getGameType() == GType_IHNM) { - event.type = kEvTOneshot; - event.code = kCursorEvent; - event.op = kEventSetNormalCursor; - event.time = 0; - _vm->_events->queue(&event); - } + event.type = kEvTOneshot; + event.code = kCursorEvent; + event.op = kEventSetNormalCursor; + event.time = 0; + _vm->_events->queue(&event); } void Scene::loadSceneDescriptor(uint32 resourceId) { |