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

dreammaster dreammaster at scummvm.org
Thu Jun 4 01:11:48 CEST 2015


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:
bc7127c522 SHERLOCK: Fix resetting cursor when leaving the map


Commit: bc7127c52222fc98c36f6b33b534acdcb10027c8
    https://github.com/scummvm/scummvm/commit/bc7127c52222fc98c36f6b33b534acdcb10027c8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-03T19:10:33-04:00

Commit Message:
SHERLOCK: Fix resetting cursor when leaving the map

Changed paths:
    engines/sherlock/events.cpp



diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index ec6863c..afd3602 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -62,8 +62,6 @@ void Events::setCursor(CursorId cursorId) {
 	if (cursorId == _cursorId)
 		return;
 
-	_cursorId = cursorId;
-
 	int hotspotX, hotspotY;
 
 	if (cursorId == MAGNIFY) {
@@ -78,9 +76,12 @@ void Events::setCursor(CursorId cursorId) {
 	Graphics::Surface &s = (*_cursorImages)[cursorId]._frame;
 
 	setCursor(s, hotspotX, hotspotY);
+
+	_cursorId = cursorId;
 }
 
 void Events::setCursor(const Graphics::Surface &src, int hotspotX, int hotspotY) {
+	_cursorId = INVALID_CURSOR;
 	CursorMan.replaceCursor(src.getPixels(), src.w, src.h, hotspotX, hotspotY, 0xff);
 	showCursor();
 }






More information about the Scummvm-git-logs mailing list