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

dreammaster dreammaster at scummvm.org
Thu Jun 4 01:07:20 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:
dce570c7e9 SHERLOCK: Fix resetting cursor when resetting UI


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

Commit Message:
SHERLOCK: Fix resetting cursor when resetting UI

Changed paths:
    engines/sherlock/scalpel/scalpel_user_interface.cpp



diff --git a/engines/sherlock/scalpel/scalpel_user_interface.cpp b/engines/sherlock/scalpel/scalpel_user_interface.cpp
index 0bb2364..16f1659 100644
--- a/engines/sherlock/scalpel/scalpel_user_interface.cpp
+++ b/engines/sherlock/scalpel/scalpel_user_interface.cpp
@@ -392,10 +392,15 @@ void ScalpelUserInterface::depressButton(int num) {
 }
 
 void ScalpelUserInterface::restoreButton(int num) {
+	Events &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
 	Common::Point pt(MENU_POINTS[num][0], MENU_POINTS[num][1]);
 	Graphics::Surface &frame = (*_controls)[num]._frame;
 
+	// Reset the cursor
+	events.setCursor(ARROW);
+
+	// Restore the UI on the back buffer
 	screen._backBuffer1.blitFrom(screen._backBuffer2, pt,
 		Common::Rect(pt.x, pt.y, pt.x + 90, pt.y + 19));
 	screen.slamArea(pt.x, pt.y, pt.x + frame.w, pt.y + frame.h);






More information about the Scummvm-git-logs mailing list