[Scummvm-git-logs] scummvm master -> eb7b57b6a8c0a24de046b4fd1dc8bd969f71ad2c

[dreammaster]

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:
eb7b57b6a8 TITANIC: Implement busy cursor like the original


Commit: eb7b57b6a8c0a24de046b4fd1dc8bd969f71ad2c
    https://github.com/scummvm/scummvm/commit/eb7b57b6a8c0a24de046b4fd1dc8bd969f71ad2c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-27T00:43:19-05:00

Commit Message:
TITANIC: Implement busy cursor like the original

Changed paths:
    engines/titanic/game_state.cpp
    engines/titanic/support/mouse_cursor.cpp
    engines/titanic/support/mouse_cursor.h


diff --git a/engines/titanic/game_state.cpp b/engines/titanic/game_state.cpp
index 26a4297..49779ad 100644
--- a/engines/titanic/game_state.cpp
+++ b/engines/titanic/game_state.cpp
@@ -83,11 +83,11 @@ void CGameState::setMode(GameStateMode newMode) {
 			_gameManager->lockInputHandler();
 
 		if (sm && sm->_mouseCursor)
-			sm->_mouseCursor->hide();
+			sm->_mouseCursor->setBusy();
 
 	} else if (newMode != GSMODE_CUTSCENE && _mode == GSMODE_CUTSCENE) {
 		if (sm && sm->_mouseCursor)
-			sm->_mouseCursor->show();
+			sm->_mouseCursor->clearBusy();
 
 		if (_gameManager)
 			_gameManager->unlockInputHandler();
diff --git a/engines/titanic/support/mouse_cursor.cpp b/engines/titanic/support/mouse_cursor.cpp
index 6300f65..c694251 100644
--- a/engines/titanic/support/mouse_cursor.cpp
+++ b/engines/titanic/support/mouse_cursor.cpp
@@ -192,6 +192,14 @@ void CMouseCursor::enableControl() {
 	CScreenManager::_screenManagerPtr->_inputHandler->decLockCount();
 }
 
+void CMouseCursor::setBusy() {
+	setCursor(CURSOR_HOURGLASS);
+}
+
+void CMouseCursor::clearBusy() {
+	setCursor(CURSOR_ARROW);
+}
+
 void CMouseCursor::setPosition(const Point &pt, double duration) {
 	_moveStartPos = g_vm->_events->getMousePos();
 	_moveDestPos = pt;
diff --git a/engines/titanic/support/mouse_cursor.h b/engines/titanic/support/mouse_cursor.h
index 1662ce7..d61e5fe 100644
--- a/engines/titanic/support/mouse_cursor.h
+++ b/engines/titanic/support/mouse_cursor.h
@@ -144,6 +144,17 @@ public:
 	void enableControl();
 
 	/**
+	 * Shows the busy cursor
+	 */
+	void setBusy();
+
+	/**
+	 * Resets the cursor back to normal
+	 */
+	void clearBusy();
+
+
+	/**
 	 * Move the mouse to a new position
 	 */
 	void setPosition(const Point &pt, double duration);