[Scummvm-cvs-logs] CVS: scummvm/saga script.h,1.89,1.90 sfuncs.cpp,1.128,1.129

Eugene Sandulenko sev at users.sourceforge.net
Mon Jun 20 05:18:37 CEST 2005


Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9409

Modified Files:
	script.h sfuncs.cpp 
Log Message:
sfShowControls implementation is NOP


Index: script.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/script.h,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- script.h	19 Jun 2005 21:18:00 -0000	1.89
+++ script.h	20 Jun 2005 12:17:21 -0000	1.90
@@ -529,7 +529,7 @@
 	void sfPlayMusic(SCRIPTFUNC_PARAMS);
 	void SF_pickClimbOutPos(SCRIPTFUNC_PARAMS);
 	void SF_tossRif(SCRIPTFUNC_PARAMS);
-	void SF_showControls(SCRIPTFUNC_PARAMS);
+	void sfShowControls(SCRIPTFUNC_PARAMS);
 	void SF_showMap(SCRIPTFUNC_PARAMS);
 	void sfPuzzleWon(SCRIPTFUNC_PARAMS);
 	void sfEnableEscape(SCRIPTFUNC_PARAMS);

Index: sfuncs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sfuncs.cpp,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- sfuncs.cpp	19 Jun 2005 21:18:00 -0000	1.128
+++ sfuncs.cpp	20 Jun 2005 12:17:22 -0000	1.129
@@ -119,7 +119,7 @@
 		OPCODE(sfPlayMusic),
 		OPCODE(SF_pickClimbOutPos),
 		OPCODE(SF_tossRif),
-		OPCODE(SF_showControls),
+		OPCODE(sfShowControls),
 		OPCODE(SF_showMap),
 		OPCODE(sfPuzzleWon),
 		OPCODE(sfEnableEscape),
@@ -1607,11 +1607,9 @@
 }
 
 // Script function #66 (0x42)
-void Script::SF_showControls(SCRIPTFUNC_PARAMS) {
-	for (int i = 0; i < nArgs; i++)
-		thread->pop();
-
-	error("STUB: SF_showControls(), %d args", nArgs);
+void Script::sfShowControls(SCRIPTFUNC_PARAMS) {
+	// It has zero implementation in Win rerelase, and in DOS
+	// release it deals with video ports.
 }
 
 // Script function #67 (0x43)





More information about the Scummvm-git-logs mailing list