[Scummvm-cvs-logs] CVS: scummvm/saga script.h,1.95,1.96 sfuncs.cpp,1.141,1.142 sthread.cpp,1.88,1.89

Eugene Sandulenko sev at users.sourceforge.net
Thu Jul 21 15:14:41 CEST 2005


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

Modified Files:
	script.h sfuncs.cpp sthread.cpp 
Log Message:
More IHNM differences


Index: script.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/script.h,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- script.h	21 Jul 2005 01:33:28 -0000	1.95
+++ script.h	21 Jul 2005 22:13:05 -0000	1.96
@@ -533,6 +533,7 @@
 	void sfVstopFX(SCRIPTFUNC_PARAMS);
 	void sfVstopLoopedFX(SCRIPTFUNC_PARAMS);
 	void sfDemoIsInteractive(SCRIPTFUNC_PARAMS);
+	void sf94(SCRIPTFUNC_PARAMS);
 	void sfDebugShowData(SCRIPTFUNC_PARAMS);
 	void SF_stub(SCRIPTFUNC_PARAMS);
 	void sfNull(SCRIPTFUNC_PARAMS);

Index: sfuncs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sfuncs.cpp,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- sfuncs.cpp	21 Jul 2005 01:33:28 -0000	1.141
+++ sfuncs.cpp	21 Jul 2005 22:13:05 -0000	1.142
@@ -229,7 +229,7 @@
 		OPCODE(SF_stub),
 		OPCODE(sfNull),
 		OPCODE(sfDemoIsInteractive),
-		OPCODE(SF_stub),
+		OPCODE(sf94),
 		OPCODE(SF_stub),
 		OPCODE(SF_stub),
 		OPCODE(SF_stub),
@@ -2027,6 +2027,13 @@
 	thread->_returnValue = 0;
 }
 
+void Script::sf94(SCRIPTFUNC_PARAMS) {
+	for (int i = 0; i < nArgs; i++)
+		thread->pop();
+
+	debug(0, "STUB: sf94(), %d args", nArgs);
+}
+
 void Script::sfDebugShowData(SCRIPTFUNC_PARAMS) {
 	int16 param = thread->pop();
 	char buf[50];

Index: sthread.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sthread.cpp,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- sthread.cpp	21 Jul 2005 01:33:28 -0000	1.88
+++ sthread.cpp	21 Jul 2005 22:13:06 -0000	1.89
@@ -317,8 +317,8 @@
 		CASEOP(opCcallV)
 			argumentsCount = scriptS.readByte();
 			functionNumber = scriptS.readUint16LE();
-			if (functionNumber >= (_vm->getGameType() == GType_IHNM) ? 
-				IHNM_SCRIPT_FUNCTION_MAX : ITE_SCRIPT_FUNCTION_MAX) {
+			if (functionNumber >= ((_vm->getGameType() == GType_IHNM) ? 
+								   IHNM_SCRIPT_FUNCTION_MAX : ITE_SCRIPT_FUNCTION_MAX)) {
 				error("Script::runThread() Invalid script function number (%d)", functionNumber);
 			}
 
@@ -330,7 +330,8 @@
 			if (disContinue) {
 				return true;
 			}
-			if (scriptFunction == &Saga::Script::sfScriptGotoScene) {			
+			if (scriptFunction == &Saga::Script::sfScriptGotoScene ||
+				scriptFunction == &Saga::Script::sf94) {
 				return true; // cause abortAllThreads called and _this_ thread destroyed
 			}
 





More information about the Scummvm-git-logs mailing list