[Scummvm-cvs-logs] CVS: scummvm/sky skydefs.h,1.12,1.13 logic.cpp,1.30,1.31

Oliver Kiehl olki at users.sourceforge.net
Sat May 24 16:20:06 CEST 2003


Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv15138

Modified Files:
	skydefs.h logic.cpp 
Log Message:
and a little bit more...


Index: skydefs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/skydefs.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- skydefs.h	24 May 2003 18:24:39 -0000	1.12
+++ skydefs.h	24 May 2003 23:17:12 -0000	1.13
@@ -40,6 +40,8 @@
 #define RESULT 0
 #define LOGIC_LIST_NO 2
 #define CUR_ID 12
+#define MOUSE_STATUS 13
+#define MOUSE_STOP 14
 #define HIT_ID 37
 #define THE_CHOSEN_ONE 51
 #define TEXT1 53

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- logic.cpp	24 May 2003 22:22:23 -0000	1.30
+++ logic.cpp	24 May 2003 23:17:12 -0000	1.31
@@ -101,7 +101,8 @@
 }
 
 void SkyLogic::lreturn() {
-	error("lreturn: Is this really called?");
+	// WTF???
+	return;
 }
 
 void SkyLogic::logicScript() {
@@ -1102,7 +1103,9 @@
 }
 
 uint32 SkyLogic::fnIdle(uint32 a, uint32 b, uint32 c) {
-	error("Stub: fnIdle");
+	// set the player idling
+	_compact->logic = 0;
+	return 1;
 }
 
 uint32 SkyLogic::fnInteract(uint32 targetId, uint32 b, uint32 c) {
@@ -1271,7 +1274,8 @@
 }
 
 uint32 SkyLogic::fnClearStop(uint32 a, uint32 b, uint32 c) {
-	error("Stub: fnClearStop");
+	_scriptVariables[MOUSE_STOP] = 0;
+	return 1;
 }
 
 uint32 SkyLogic::fnPointerText(uint32 a, uint32 b, uint32 c) {
@@ -1685,7 +1689,8 @@
 }
 
 uint32 SkyLogic::fnSkipIntroCode(uint32 a, uint32 b, uint32 c) {
-	error("Stub: fnSkipIntroCode");
+	warning("Stub: fnSkipIntroCode");
+	return 1;
 }
 
 uint32 SkyLogic::fnBlankScreen(uint32 a, uint32 b, uint32 c) {





More information about the Scummvm-git-logs mailing list