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

[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:
a330d993ae LAB: Use cursor manager to set, show and hide the cursor


Commit: a330d993ae6b216b223d1acada2652ed23286490
    https://github.com/scummvm/scummvm/commit/a330d993ae6b216b223d1acada2652ed23286490
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2016-01-06T11:19:53+01:00

Commit Message:
LAB: Use cursor manager to set, show and hide the cursor

While not strictly necessary, without this the debug console will
mess up the cursor on closing, because it doesn't know what cursor
to restore.

Changed paths:
    engines/lab/eventman.cpp



diff --git a/engines/lab/eventman.cpp b/engines/lab/eventman.cpp
index a94ddbf..b134837 100644
--- a/engines/lab/eventman.cpp
+++ b/engines/lab/eventman.cpp
@@ -30,6 +30,8 @@
 
 #include "common/events.h"
 
+#include "graphics/cursorman.h"
+
 #include "lab/lab.h"
 
 #include "lab/dispman.h"
@@ -125,18 +127,18 @@ void EventManager::updateMouse() {
 }
 
 void EventManager::initMouse() {
-	_vm->_system->setMouseCursor(mouseData, MOUSE_WIDTH, MOUSE_HEIGHT, 0, 0, 0);
-	_vm->_system->showMouse(false);
+	CursorMan.pushCursor(mouseData, MOUSE_WIDTH, MOUSE_HEIGHT, 0, 0, 0);
+	CursorMan.showMouse(false);
 
 	setMousePos(Common::Point(_vm->_graphics->_screenWidth / 2, _vm->_graphics->_screenHeight / 2));
 }
 
 void EventManager::mouseShow() {
-	_vm->_system->showMouse(true);
+	CursorMan.showMouse(true);
 }
 
 void EventManager::mouseHide() {
-	_vm->_system->showMouse(false);
+	CursorMan.showMouse(false);
 }
 
 void EventManager::setMousePos(Common::Point pos) {