add fnNormalMouse()

svn-id: r8238

3 files changed, 7 insertions, 11 deletions

diff --git a/sky/logic.cpp b/sky/logic.cpp
index 01ae37e313..f766eee691 100644
--- a/sky/logic.cpp
+++ b/sky/logic.cpp
@@ -1342,7 +1342,7 @@ bool SkyLogic::fnDiskMouse(uint32 a, uint32 b, uint32 c) {
 }
 
 bool SkyLogic::fnNormalMouse(uint32 a, uint32 b, uint32 c) {
-	error("Stub: fnNormalMouse");
+	return _skyMouse->fnNormalMouse();
 }
 
 bool SkyLogic::fnBlankMouse(uint32 a, uint32 b, uint32 c) {
diff --git a/sky/mouse.cpp b/sky/mouse.cpp
index 61c7bb7d9d..393aacf967 100644
--- a/sky/mouse.cpp
+++ b/sky/mouse.cpp
@@ -103,51 +103,47 @@ SkyMouse::SkyMouse(OSystem *system, SkyDisk *skyDisk) {
 }
 
 SkyMouse::~SkyMouse( ){
-
 	free (_miceData);
 	free (_savedData);
 	free (_objectMouseData);
 }
 
 void SkyMouse::replaceMouseCursors(uint16 fileNo) {
-
 	_skyDisk->loadFile(fileNo, _objectMouseData);
 }
 
 bool SkyMouse::fnBlankMouse(void) {
-
 	_mouseXOff = 0;	//re-align mouse
 	spriteMouse(MOUSE_BLANK, 0, 0);
 	return true;
 }
 
 bool SkyMouse::fnDiskMouse(void) {
-
 	//turn the mouse into a disk mouse
 	spriteMouse(MOUSE_DISK, 11, 11);
 	return true;	//don't quit from the interpreter
-	
 }
 
-void SkyMouse::lockMouse(void) {
+bool SkyMouse::fnNormalMouse(void) {
+	spriteMouse(MOUSE_NORMAL, 0, 0);
+	return true;
+}
 
+void SkyMouse::lockMouse(void) {
 	_lockMouseX = _aMouseX;
 	_lockMouseY = _aMouseY;
 }
 
 void SkyMouse::unlockMouse(void) {
-
 	_aMouseX = _lockMouseX;
 	_aMouseY = _lockMouseY;
 }
 
 void SkyMouse::restoreMouseData(uint16 frameNum) {
-
 	warning("Stub: SkyMouse::restoreMouseData");
 }
 
 void SkyMouse::drawNewMouse() {
-
 	warning("Stub: SkyMouse::drawNewMouse");
 	//calculateMouseValues();
 	//saveMouseData();
@@ -155,7 +151,6 @@ void SkyMouse::drawNewMouse() {
 }
 
 void SkyMouse::spriteMouse(uint16 frameNum, uint16 mouseX, uint16 mouseY) {
-
 	//_mouseFlag |= MF_IN_INT;
 	_mouseType2 = frameNum;
 	_mouseOffsetX = mouseX;
diff --git a/sky/mouse.h b/sky/mouse.h
index 98750a94fc..b48b364583 100644
--- a/sky/mouse.h
+++ b/sky/mouse.h
@@ -36,6 +36,7 @@ public:
 	void replaceMouseCursors(uint16 fileNo);
 	bool fnBlankMouse(void);
 	bool fnDiskMouse(void);
+	bool fnNormalMouse(void);
 	void lockMouse(void);
 	void unlockMouse(void);
 	void restoreMouseData(uint16 frameNum);