[Scummvm-cvs-logs] CVS: scummvm/saga sfuncs.cpp,1.38,1.39

[Torbjörn Andersson]

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

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


Index: sfuncs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sfuncs.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- sfuncs.cpp	7 Nov 2004 15:23:00 -0000	1.38
+++ sfuncs.cpp	7 Nov 2004 15:28:20 -0000	1.39
@@ -348,10 +348,18 @@
 
 // Script function #17 (0x11)
 int Script::SF_setObjImage(SCRIPTFUNC_PARAMS) {
-	for (int i = 0; i < nArgs; i++)
-		thread->pop();
+	SDataWord_T obj_param = thread->pop();
+	SDataWord_T sprite_param = thread->pop();
+
+	int index = obj_param & 0x1FFF;
+
+	if (index >= ARRAYSIZE(ObjectTable)) {
+		return FAILURE;
+	}
+
+	ObjectTable[index].spritelistRn = sprite_param + 9;
+	_vm->_interface->draw();
 
-	debug(1, "stub: SF_setObjImage(), %d args", nArgs);
 	return SUCCESS;
 }