[Scummvm-cvs-logs] CVS: scummvm/saga sfuncs.cpp,1.36,1.37

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Sun Nov 7 07:19:11 CET 2004


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

Modified Files:
	sfuncs.cpp 
Log Message:
Unstubbed SF_sceneID(). (Untested)


Index: sfuncs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sfuncs.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- sfuncs.cpp	7 Nov 2004 15:11:04 -0000	1.36
+++ sfuncs.cpp	7 Nov 2004 15:16:57 -0000	1.37
@@ -552,7 +552,6 @@
 	return SUCCESS;
 }
 
-
 // Script function #32 (0x20)
 int Script::SF_dropObject(SCRIPTFUNC_PARAMS) {
 	SDataWord_T obj_param = thread->pop();
@@ -915,10 +914,7 @@
 
 // Script function #54 (0x36)
 int Script::SF_sceneID(SCRIPTFUNC_PARAMS) {
-	for (int i = 0; i < nArgs; i++)
-		thread->pop();
-
-	debug(1, "stub: SF_sceneID(), %d args", nArgs);
+	thread->retVal = _vm->_scene->currentSceneNumber();
 	return SUCCESS;
 }
 





More information about the Scummvm-git-logs mailing list