aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Kurushin2005-06-15 19:30:11 +0000
committerAndrew Kurushin2005-06-15 19:30:11 +0000
commit1e2131d0eec4a4cc828cb21c329912d427823053 (patch)
treebe5f524cc0888a64972dae2f51ac76e7993351bf
parente0d9d4eb4a96d11b99d8fa5b9acba78fa57fcc94 (diff)
downloadscummvm-rg350-1e2131d0eec4a4cc828cb21c329912d427823053.tar.gz
scummvm-rg350-1e2131d0eec4a4cc828cb21c329912d427823053.tar.bz2
scummvm-rg350-1e2131d0eec4a4cc828cb21c329912d427823053.zip
some renames#2
svn-id: r18398
-rw-r--r--saga/sfuncs.cpp22
1 files changed, 16 insertions, 6 deletions
diff --git a/saga/sfuncs.cpp b/saga/sfuncs.cpp
index 2ac829ddb8..f29a3e9a4d 100644
--- a/saga/sfuncs.cpp
+++ b/saga/sfuncs.cpp
@@ -110,7 +110,7 @@ void Script::setupScriptFuncList(void) {
OPCODE(sfScriptClimb),
OPCODE(sfSetDoorState),
OPCODE(sfSetActorZ),
- OPCODE(SF_text),
+ OPCODE(sfScriptText),
OPCODE(sfGetActorX),
OPCODE(sfGetActorY),
OPCODE(sfEraseDelta),
@@ -526,7 +526,7 @@ void Script::sfScriptGotoScene(SCRIPTFUNC_PARAMS) {
}
}
- _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 @@ void Script::sfSetActorZ(SCRIPTFUNC_PARAMS) {
}
// 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)