[Scummvm-cvs-logs] CVS: scummvm/saga sfuncs.cpp,1.124,1.125

Andrew Kurushin h00ligan at users.sourceforge.net
Wed Jun 15 12:30:41 CEST 2005


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

Modified Files:
	sfuncs.cpp 
Log Message:
some renames#2

Index: sfuncs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sfuncs.cpp,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- sfuncs.cpp	13 Jun 2005 13:40:28 -0000	1.124
+++ sfuncs.cpp	15 Jun 2005 19:30:11 -0000	1.125
@@ -110,7 +110,7 @@
 		OPCODE(sfScriptClimb),
 		OPCODE(sfSetDoorState),
 		OPCODE(sfSetActorZ),
-		OPCODE(SF_text),
+		OPCODE(sfScriptText),
 		OPCODE(sfGetActorX),
 		OPCODE(sfGetActorY),
 		OPCODE(sfEraseDelta),
@@ -526,7 +526,7 @@
 		}
 	}
 
-	_vm->_scene->changeScene(sceneNumber, entrance, (sceneNumber == RID_ITE_ENDCREDIT_SCENE_1) ? kTransitionFade : kTransitionNoFade);
+	_vm->_scene->changeScene(sceneNumber, entrance, (sceneNumber == ITE_SCENE_ENDCREDIT1) ? kTransitionFade : kTransitionNoFade);
 
 	//TODO: placard stuff
 	_pendingVerb = kVerbNone;
@@ -1491,11 +1491,21 @@
 }
 
 // Script function #59 (0x3B)
-void Script::SF_text(SCRIPTFUNC_PARAMS) {
-	for (int i = 0; i < nArgs; i++)
-		thread->pop();
+// Param1: stringId
+// Param2: flags
+// Param3: color
+// Param4: x
+// Param5: y
+void Script::sfScriptText(SCRIPTFUNC_PARAMS) {
+	int16 stringId;
+	int16 flags;
+	Point point;
+	stringId = thread->pop();
+	flags = thread->pop();
+	point.x = thread->pop();
+	point.y = thread->pop();
+//TODO: do it!!!
 
-	warning("STUB: SF_text(), %d args", nArgs);
 }
 
 // Script function #60 (0x3C)





More information about the Scummvm-git-logs mailing list