diff options
| author | Torbjörn Andersson | 2015-06-02 19:08:40 +0200 |
|---|---|---|
| committer | Torbjörn Andersson | 2015-06-02 19:08:40 +0200 |
| commit | fdd220e9f77658d765ecf2c9d2e5fb4f022663ea (patch) | |
| tree | d573c43c6b85f76cc64c0535af5cda069677c844 | |
| parent | 1968528a1f8c8f8cce730e74478832b17e375c1a (diff) | |
| download | scummvm-rg350-fdd220e9f77658d765ecf2c9d2e5fb4f022663ea.tar.gz scummvm-rg350-fdd220e9f77658d765ecf2c9d2e5fb4f022663ea.tar.bz2 scummvm-rg350-fdd220e9f77658d765ecf2c9d2e5fb4f022663ea.zip | |
SHERLOCK: Fix Scalpel cursor regressions
There was no magnifying glass cursor, and the hourglass cursor
wasn't animated.
| -rw-r--r-- | engines/sherlock/events.cpp | 2 | ||||
| -rw-r--r-- | engines/sherlock/scalpel/scalpel_scene.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp index b238605e13..216ef158a3 100644 --- a/engines/sherlock/events.cpp +++ b/engines/sherlock/events.cpp @@ -77,7 +77,7 @@ void Events::setCursor(const Graphics::Surface &src) { void Events::animateCursorIfNeeded() { if (_cursorId >= WAIT && _cursorId < (WAIT + 3)) { - CursorId newId = (WAIT + 2) ? WAIT : (CursorId)((int)_cursorId + 1); + CursorId newId = (_cursorId == WAIT + 2) ? WAIT : (CursorId)((int)_cursorId + 1); setCursor(newId); } } diff --git a/engines/sherlock/scalpel/scalpel_scene.cpp b/engines/sherlock/scalpel/scalpel_scene.cpp index b6a42419d8..c2fbd6e2fb 100644 --- a/engines/sherlock/scalpel/scalpel_scene.cpp +++ b/engines/sherlock/scalpel/scalpel_scene.cpp @@ -60,6 +60,7 @@ void ScalpelScene::doBgAnimCheckCursor() { Sound &sound = *_vm->_sound; UserInterface &ui = *_vm->_ui; Common::Point mousePos = events.mousePos(); + events.animateCursorIfNeeded(); if (ui._menuMode == LOOK_MODE) { if (mousePos.y > CONTROLS_Y1) @@ -94,6 +95,8 @@ void ScalpelScene::doBgAnim() { Screen &screen = *_vm->_screen; Talk &talk = *_vm->_talk; + doBgAnimCheckCursor(); + screen.setDisplayBounds(Common::Rect(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCENE_HEIGHT)); talk._talkToAbort = false; |