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

[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:
f01d1c649b TITANIC: Clarify CMouseCursor saveState as setPosition


Commit: f01d1c649b44eac84a630109d0e5708f23313706
    https://github.com/scummvm/scummvm/commit/f01d1c649b44eac84a630109d0e5708f23313706
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-08-29T20:31:09-04:00

Commit Message:
TITANIC: Clarify CMouseCursor saveState as setPosition

Changed paths:
    engines/titanic/core/game_object.cpp
    engines/titanic/core/game_object.h
    engines/titanic/npcs/doorbot.cpp
    engines/titanic/support/mouse_cursor.cpp
    engines/titanic/support/mouse_cursor.h



diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index f450e02..2c7b7db 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -1160,8 +1160,8 @@ void CGameObject::mouseUnlockE4() {
 	CScreenManager::_screenManagerPtr->_mouseCursor->unlockE4();
 }
 
-void CGameObject::mouseSaveState(int v1, int v2, int v3) {
-	CScreenManager::_screenManagerPtr->_mouseCursor->saveState(v1, v2, v3);
+void CGameObject::mouseSetPosition(const Point &pt, double rate) {
+	CScreenManager::_screenManagerPtr->_mouseCursor->setPosition(pt, rate);
 }
 
 void CGameObject::lockInputHandler() {
diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h
index 39cdb60..182d165 100644
--- a/engines/titanic/core/game_object.h
+++ b/engines/titanic/core/game_object.h
@@ -166,7 +166,10 @@ protected:
 	void mouseLockE4();
 	void mouseUnlockE4();
 
-	void mouseSaveState(int v1, int v2, int v3);
+	/**
+	 * Sets the mouse to a new position
+	 */
+	void mouseSetPosition(const Point &pt, double rate);
 
 	/**
 	 * Lock the input handler
diff --git a/engines/titanic/npcs/doorbot.cpp b/engines/titanic/npcs/doorbot.cpp
index 4a5f369..41ef2b2 100644
--- a/engines/titanic/npcs/doorbot.cpp
+++ b/engines/titanic/npcs/doorbot.cpp
@@ -288,7 +288,7 @@ bool CDoorbot::TimerMsg(CTimerMsg *msg) {
 
 		case 6:
 			CMouseButtonDownMsg::generate();
-			mouseSaveState(200, 430, 2500);
+			mouseSetPosition(Point(200, 430), 2500);
 			_timerId = addTimer(7, 2500, 0);
 			break;
 
@@ -476,7 +476,7 @@ bool CDoorbot::TrueTalkNotifySpeechEndedMsg(CTrueTalkNotifySpeechEndedMsg *msg)
 
 		case 10568:
 			mouseLockE4();
-			mouseSaveState(600, 250, 2500);
+			mouseSetPosition(Point(600, 250), 2500);
 			_timerId = addTimer(6, 2500, 0);
 			break;
 
@@ -488,7 +488,7 @@ bool CDoorbot::TrueTalkNotifySpeechEndedMsg(CTrueTalkNotifySpeechEndedMsg *msg)
 			break;
 
 		case 10570:
-			mouseSaveState(200, 430, 2500);
+			mouseSetPosition(Point(200, 430), 2500);
 			_timerId = addTimer(7, 3000, 0);
 			break;
 
diff --git a/engines/titanic/support/mouse_cursor.cpp b/engines/titanic/support/mouse_cursor.cpp
index 068267c..4f949a1 100644
--- a/engines/titanic/support/mouse_cursor.cpp
+++ b/engines/titanic/support/mouse_cursor.cpp
@@ -128,8 +128,11 @@ void CMouseCursor::unlockE4() {
 	CScreenManager::_screenManagerPtr->_inputHandler->decLockCount();
 }
 
-void CMouseCursor::saveState(int v1, int v2, int v3) {
-	// TODO
+void CMouseCursor::setPosition(const Point &pt, double rate) {
+	assert(rate >= 0.0 && rate <= 1.0);
+	
+	// TODO: Figure out use of the rate parameter
+	g_system->warpMouse(pt.x, pt.y);
 }
 
 } // End of namespace Titanic
diff --git a/engines/titanic/support/mouse_cursor.h b/engines/titanic/support/mouse_cursor.h
index 7a81ad4..74fb1f6 100644
--- a/engines/titanic/support/mouse_cursor.h
+++ b/engines/titanic/support/mouse_cursor.h
@@ -24,8 +24,8 @@
 #define TITANIC_MOUSE_CURSOR_H
 
 #include "common/scummsys.h"
-#include "common/rect.h"
 #include "graphics/managed_surface.h"
+#include "titanic/support/rect.h"
 
 namespace Titanic {
 
@@ -105,7 +105,10 @@ public:
 	void lockE4();
 	void unlockE4();
 
-	void saveState(int v1, int v2, int v3);
+	/**
+	 * Sets the mouse to a new position
+	 */
+	void setPosition(const Point &pt, double rate);
 };