From 063c310917f981f5075c91097c46963d1fa9a94b Mon Sep 17 00:00:00 2001
From: Joost Peters
Date: Sun, 1 Jun 2003 12:49:39 +0000
Subject: added some buggy, incomplete mouse code

svn-id: r8233
---
 sky/logic.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'sky/logic.cpp')

diff --git a/sky/logic.cpp b/sky/logic.cpp
index 57cd263064..495caca726 100644
--- a/sky/logic.cpp
+++ b/sky/logic.cpp
@@ -1187,8 +1187,7 @@ bool SkyLogic::fnAssignBase(uint32 id, uint32 scr, uint32 c) {
 }
 
 bool SkyLogic::fnDiskMouse(uint32 a, uint32 b, uint32 c) {
-	warning("Stub: fnDiskMouse");
-	return true;
+	return _skyMouse->fnDiskMouse();
 }
 
 bool SkyLogic::fnNormalMouse(uint32 a, uint32 b, uint32 c) {
@@ -1196,7 +1195,7 @@ bool SkyLogic::fnNormalMouse(uint32 a, uint32 b, uint32 c) {
 }
 
 bool SkyLogic::fnBlankMouse(uint32 a, uint32 b, uint32 c) {
-	return (_skyMouse->fnBlankMouse() != 0);
+	return _skyMouse->fnBlankMouse();
 }
 
 bool SkyLogic::fnCrossMouse(uint32 a, uint32 b, uint32 c) {
@@ -2060,12 +2059,11 @@ void SkyLogic::stdSpeak(Compact *target, uint32 textNum, uint32 animNum, uint32
 
 	if (SkyTalkAnims::animTalkTableIsPointer[offset]) //is it a pointer?
 		animPtr = (uint16 *)SkyTalkAnims::animTalkTablePtr[offset];
-	else { 	//then it must be a value
+	else  	//then it must be a value
 		animPtr = (uint16 *)SkyState::fetchCompact(SkyTalkAnims::animTalkTableVal[offset]);
-		target->offset = *animPtr++;
-		target->getToFlag = *animPtr++;
-	}
-
+	
+	target->offset = *animPtr++;
+	target->getToFlag = *animPtr++;
 	target->grafixProg = animPtr;
 
 	if (SkyState::isCDVersion(_gameVersion))
-- 
cgit v1.2.3