[Scummvm-cvs-logs] scummvm master -> fdd220e9f77658d765ecf2c9d2e5fb4f022663ea

[eriktorbjorn]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
fdd220e9f7 SHERLOCK: Fix Scalpel cursor regressions


Commit: fdd220e9f77658d765ecf2c9d2e5fb4f022663ea
    https://github.com/scummvm/scummvm/commit/fdd220e9f77658d765ecf2c9d2e5fb4f022663ea
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2015-06-02T19:08:40+02:00

Commit Message:
SHERLOCK: Fix Scalpel cursor regressions

There was no magnifying glass cursor, and the hourglass cursor
wasn't animated.

Changed paths:
    engines/sherlock/events.cpp
    engines/sherlock/scalpel/scalpel_scene.cpp



diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index b238605..216ef15 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 b6a4241..c2fbd6e 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;