[Scummvm-cvs-logs] CVS: scummvm/saga sthread.cpp,1.47,1.48 sfuncs.cpp,1.49,1.50

Andrew Kurushin h00ligan at users.sourceforge.net
Fri Dec 24 03:10:04 CET 2004


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

Modified Files:
	sthread.cpp sfuncs.cpp 
Log Message:
- opCCall* on debuglevel==9 shows script function name

Index: sthread.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sthread.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- sthread.cpp	24 Dec 2004 10:22:01 -0000	1.47
+++ sthread.cpp	24 Dec 2004 11:08:52 -0000	1.48
@@ -391,14 +391,14 @@
 
 				argumentsCount = scriptS.readByte();
 				functionNumber = scriptS.readUint16LE();
-				debug(9, "opCCall* 0x%X", functionNumber);
 				if (functionNumber >= SCRIPT_FUNCTION_MAX) {
 					_vm->_console->DebugPrintf(S_ERROR_PREFIX "Invalid script function number: (%X)\n", functionNumber);
 					thread->flags |= kTFlagAborted;
 					break;
 				}
 
-				scriptFunction = _scriptFunctionsList[functionNumber];
+				debug(9, "opCCall* Calling 0x%X %s", functionNumber, _scriptFunctionsList[functionNumber].scriptFunctionName);
+				scriptFunction = _scriptFunctionsList[functionNumber].scriptFunction;
 				scriptFunctionReturnValue = (this->*scriptFunction)(thread, argumentsCount);
 				if (scriptFunctionReturnValue != SUCCESS) {
 					_vm->_console->DebugPrintf(S_WARN_PREFIX "%X: Script function %d failed.\n", thread->i_offset, scriptFunctionReturnValue);

Index: sfuncs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sfuncs.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- sfuncs.cpp	24 Dec 2004 10:22:01 -0000	1.49
+++ sfuncs.cpp	24 Dec 2004 11:09:00 -0000	1.50
@@ -41,10 +41,10 @@
 
 namespace Saga {
 
-#define OPCODE(x) &Script::x
+#define OPCODE(x) {&Script::x, #x}
 
 void Script::setupScriptFuncList(void) {
-	static const ScriptFunctionType scriptFunctionsList[SCRIPT_FUNCTION_MAX] = {
+	static const ScriptFunctionDescription scriptFunctionsList[SCRIPT_FUNCTION_MAX] = {
 		OPCODE(SF_putString),
 		OPCODE(sfWait),
 		OPCODE(SF_takeObject),





More information about the Scummvm-git-logs mailing list