[Scummvm-cvs-logs] CVS: scummvm/saga script.h,1.24,1.25 sfuncs.cpp,1.33,1.34 sthread.cpp,1.36,1.37
Eugene Sandulenko
sev at users.sourceforge.net
Sat Nov 6 14:39:26 CET 2004
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1585
Modified Files:
script.h sfuncs.cpp sthread.cpp
Log Message:
Add stub for every script function
Index: script.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/script.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- script.h 27 Oct 2004 22:17:10 -0000 1.24
+++ script.h 6 Nov 2004 22:33:08 -0000 1.25
@@ -179,7 +179,7 @@
int len;
};
-#define SCRIPTFUNC_PARAMS SCRIPT_THREAD *thread
+#define SCRIPTFUNC_PARAMS SCRIPT_THREAD *thread, int nArgs
class Script {
public:
@@ -246,66 +246,89 @@
private:
typedef int (Script::*SFunc_T)(SCRIPTFUNC_PARAMS);
- struct SFUNC_ENTRY {
- int sfunc_num;
- int sfunc_argc;
- SFunc_T sfunc_fp;
- };
-
- const SFUNC_ENTRY *_SFuncList;
+ const SFunc_T *_SFuncList;
void setupScriptFuncList(void);
int SDebugPrintInstr(SCRIPT_THREAD *thread);
+ int SF_putString(SCRIPTFUNC_PARAMS);
int SF_sleep(SCRIPTFUNC_PARAMS);
int SF_takeObject(SCRIPTFUNC_PARAMS);
int SF_objectIsCarried(SCRIPTFUNC_PARAMS);
int SF_setStatusText(SCRIPTFUNC_PARAMS);
int SF_commandMode(SCRIPTFUNC_PARAMS);
int SF_actorWalkTo(SCRIPTFUNC_PARAMS);
+ int SF_doAction(SCRIPTFUNC_PARAMS);
int SF_setFacing(SCRIPTFUNC_PARAMS);
int SF_startBgdAnim(SCRIPTFUNC_PARAMS);
+ int SF_stopBgdAnim(SCRIPTFUNC_PARAMS);
int SF_freezeInterface(SCRIPTFUNC_PARAMS);
int SF_dialogMode(SCRIPTFUNC_PARAMS);
+ int SF_killActorThreads(SCRIPTFUNC_PARAMS);
+ int SF_faceTowards(SCRIPTFUNC_PARAMS);
+ int SF_setFollower(SCRIPTFUNC_PARAMS);
+ int SF_gotoScene(SCRIPTFUNC_PARAMS);
+ int SF_setObjImage(SCRIPTFUNC_PARAMS);
+ int SF_setObjName(SCRIPTFUNC_PARAMS);
+ int SF_getObjName(SCRIPTFUNC_PARAMS);
+ int SF_getNumber(SCRIPTFUNC_PARAMS);
+ int SF_openDoor(SCRIPTFUNC_PARAMS);
+ int SF_closeDoor(SCRIPTFUNC_PARAMS);
+ int SF_setBgdAnimSpeed(SCRIPTFUNC_PARAMS);
+ int SF_cycleColors(SCRIPTFUNC_PARAMS);
+ int SF_centerActor(SCRIPTFUNC_PARAMS);
int SF_startAnim(SCRIPTFUNC_PARAMS);
- int SF_stopBgdAnim(SCRIPTFUNC_PARAMS);
int SF_actorWalkToAsync(SCRIPTFUNC_PARAMS);
+ int SF_enableZone(SCRIPTFUNC_PARAMS);
+ int SF_setActorState(SCRIPTFUNC_PARAMS);
int SF_moveTo(SCRIPTFUNC_PARAMS);
+ int SF_sceneEq(SCRIPTFUNC_PARAMS);
+ int SF_dropObject(SCRIPTFUNC_PARAMS);
+ int SF_finishBgdAnim(SCRIPTFUNC_PARAMS);
+ int SF_swapActors(SCRIPTFUNC_PARAMS);
+ int SF_simulSpeech(SCRIPTFUNC_PARAMS);
int SF_actorWalk(SCRIPTFUNC_PARAMS);
int SF_cycleActorFrames(SCRIPTFUNC_PARAMS);
int SF_setFrame(SCRIPTFUNC_PARAMS);
int SF_setRightPortrait(SCRIPTFUNC_PARAMS);
int SF_setLeftPortrait(SCRIPTFUNC_PARAMS);
int SF_linkAnim(SCRIPTFUNC_PARAMS);
+ int SF_scriptSpecialWalk(SCRIPTFUNC_PARAMS);
int SF_placeActor(SCRIPTFUNC_PARAMS);
int SF_checkUserInterrupt(SCRIPTFUNC_PARAMS);
- int SF_moveRelative(SCRIPTFUNC_PARAMS);
- int SF_doAction(SCRIPTFUNC_PARAMS);
- int SF_faceTowards(SCRIPTFUNC_PARAMS);
- int SF_setFollower(SCRIPTFUNC_PARAMS);
- int SF_setBgdAnimSpeed(SCRIPTFUNC_PARAMS);
- int SF_centerActor(SCRIPTFUNC_PARAMS);
- int SF_setActorState(SCRIPTFUNC_PARAMS);
- int SF_finishBgdAnim(SCRIPTFUNC_PARAMS);
- int SF_swapActors(SCRIPTFUNC_PARAMS);
- int SF_scriptSpecialWalk(SCRIPTFUNC_PARAMS);
int SF_walkRelative(SCRIPTFUNC_PARAMS);
+ int SF_moveRelative(SCRIPTFUNC_PARAMS);
+ int SF_simulSPeech2(SCRIPTFUNC_PARAMS);
+ int SF_placard(SCRIPTFUNC_PARAMS);
+ int SF_placardOff(SCRIPTFUNC_PARAMS);
+ int SF_setProtagState(SCRIPTFUNC_PARAMS);
+ int SF_resumeBgdAnim(SCRIPTFUNC_PARAMS);
int SF_throwActor(SCRIPTFUNC_PARAMS);
int SF_waitWalk(SCRIPTFUNC_PARAMS);
+ int SF_sceneID(SCRIPTFUNC_PARAMS);
int SF_changeActorScene(SCRIPTFUNC_PARAMS);
int SF_climb(SCRIPTFUNC_PARAMS);
+ int SF_setDoorState(SCRIPTFUNC_PARAMS);
int SF_setActorZ(SCRIPTFUNC_PARAMS);
+ int SF_text(SCRIPTFUNC_PARAMS);
int SF_getActorX(SCRIPTFUNC_PARAMS);
int SF_getActorY(SCRIPTFUNC_PARAMS);
+ int SF_eraseDelta(SCRIPTFUNC_PARAMS);
int SF_playMusic(SCRIPTFUNC_PARAMS);
+ int SF_pickClimbOutPos(SCRIPTFUNC_PARAMS);
+ int SF_tossRif(SCRIPTFUNC_PARAMS);
+ int SF_showControls(SCRIPTFUNC_PARAMS);
+ int SF_showMap(SCRIPTFUNC_PARAMS);
+ int SF_puzzleWon(SCRIPTFUNC_PARAMS);
int SF_enableEscape(SCRIPTFUNC_PARAMS);
int SF_playSound(SCRIPTFUNC_PARAMS);
- int SF_gotoScene(SCRIPTFUNC_PARAMS);
+ int SF_playLoopedSound(SCRIPTFUNC_PARAMS);
+ int SF_getDeltaFrame(SCRIPTFUNC_PARAMS);
+ int SF_showProtect(SCRIPTFUNC_PARAMS);
+ int SF_protectResult(SCRIPTFUNC_PARAMS);
int SF_rand(SCRIPTFUNC_PARAMS);
- int SF_sceneEq(SCRIPTFUNC_PARAMS);
- int SF_placard(SCRIPTFUNC_PARAMS);
- int SF_placardOff(SCRIPTFUNC_PARAMS);
int SF_fadeMusic(SCRIPTFUNC_PARAMS);
+ int SF_playVoice(SCRIPTFUNC_PARAMS);
};
} // End of namespace Saga
Index: sfuncs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sfuncs.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- sfuncs.cpp 1 Nov 2004 10:49:21 -0000 1.33
+++ sfuncs.cpp 6 Nov 2004 22:33:08 -0000 1.34
@@ -44,89 +44,98 @@
#define OPCODE(x) &Script::x
void Script::setupScriptFuncList(void) {
- static const SFUNC_ENTRY SFuncList[SFUNC_NUM] = {
- {0, 0, NULL},
- {1, 1, OPCODE(SF_sleep)},
- {2, 1, OPCODE(SF_takeObject)},
- {3, 1, OPCODE(SF_objectIsCarried)},
- {4, 1, OPCODE(SF_setStatusText)},
- {5, 0, OPCODE(SF_commandMode)},
- {6, 3, OPCODE(SF_actorWalkTo)},
- {7, 4, OPCODE(SF_doAction)},
- {8, 2, OPCODE(SF_setFacing)},
- {9, 2, OPCODE(SF_startBgdAnim)},
- {10, 1, OPCODE(SF_stopBgdAnim)},
- {11, 1, OPCODE(SF_freezeInterface)},
- {12, 0, OPCODE(SF_dialogMode)},
- {13, 0, NULL},
- {14, 2, OPCODE(SF_faceTowards)},
- {15, 2, OPCODE(SF_setFollower)},
- {16, 2, OPCODE(SF_gotoScene)},
- {17, 0, NULL},
- {18, 0, NULL},
- {19, 0, NULL},
- {20, 0, NULL},
- {21, 0, NULL},
- {22, 0, NULL},
- {23, 2, OPCODE(SF_setBgdAnimSpeed)},
- {24, 0, NULL},
- {25, 1, OPCODE(SF_centerActor)},
- {26, 3, OPCODE(SF_startAnim)},
- {27, 3, OPCODE(SF_actorWalkToAsync)},
- {28, 0, NULL},
- {29, 2, OPCODE(SF_setActorState)},
- {30, 3, OPCODE(SF_moveTo)},
- {31, 1, OPCODE(SF_sceneEq)},
- {32, 0, NULL},
- {33, 1, OPCODE(SF_finishBgdAnim)},
- {34, 2, OPCODE(SF_swapActors)},
- {35, 0, NULL},
- {36, 4, OPCODE(SF_actorWalk)},
- {37, 4, OPCODE(SF_cycleActorFrames)},
- {38, 3, OPCODE(SF_setFrame)},
- {39, 1, OPCODE(SF_setRightPortrait)},
- {40, 1, OPCODE(SF_setLeftPortrait)},
- {41, 4, OPCODE(SF_linkAnim)},
- {42, 4, OPCODE(SF_scriptSpecialWalk)},
- {43, 6, OPCODE(SF_placeActor)},
- {44, 0, OPCODE(SF_checkUserInterrupt)},
- {45, 5, OPCODE(SF_walkRelative)},
- {46, 5, OPCODE(SF_moveRelative)},
- {47, 0, NULL},
- {48, 0, OPCODE(SF_placard)},
- {49, 0, OPCODE(SF_placardOff)},
- {50, 0, NULL},
- {51, 0, NULL},
- {52, 6, OPCODE(SF_throwActor)},
- {53, 1, OPCODE(SF_waitWalk)},
- {54, 0, NULL},
- {55, 2, OPCODE(SF_changeActorScene)},
- {56, 4, OPCODE(SF_climb)},
- {57, 0, NULL},
- {58, 2, OPCODE(SF_setActorZ)},
- {59, 0, NULL},
- {60, 1, OPCODE(SF_getActorX)},
- {61, 1, OPCODE(SF_getActorY)},
- {62, 0, NULL},
- {63, 1, OPCODE(SF_playMusic)},
- {64, 0, NULL},
- {65, 0, NULL},
- {66, 0, NULL},
- {67, 0, NULL},
- {68, 0, NULL},
- {69, 1, OPCODE(SF_enableEscape)},
- {70, 1, OPCODE(SF_playSound)},
- {71, 0, NULL},
- {72, 0, NULL},
- {73, 0, NULL},
- {74, 0, NULL},
- {75, 1, OPCODE(SF_rand)},
- {76, 0, OPCODE(SF_fadeMusic)},
- {77, 0, NULL}
+ static const SFunc_T SFuncList[SFUNC_NUM] = {
+ OPCODE(SF_putString),
+ OPCODE(SF_sleep),
+ OPCODE(SF_takeObject),
+ OPCODE(SF_objectIsCarried),
+ OPCODE(SF_setStatusText),
+ OPCODE(SF_commandMode),
+ OPCODE(SF_actorWalkTo),
+ OPCODE(SF_doAction),
+ OPCODE(SF_setFacing),
+ OPCODE(SF_startBgdAnim),
+ OPCODE(SF_stopBgdAnim),
+ OPCODE(SF_freezeInterface),
+ OPCODE(SF_dialogMode),
+ OPCODE(SF_killActorThreads),
+ OPCODE(SF_faceTowards),
+ OPCODE(SF_setFollower),
+ OPCODE(SF_gotoScene),
+ OPCODE(SF_setObjImage),
+ OPCODE(SF_setObjName),
+ OPCODE(SF_getObjName),
+ OPCODE(SF_getNumber),
+ OPCODE(SF_openDoor),
+ OPCODE(SF_closeDoor),
+ OPCODE(SF_setBgdAnimSpeed),
+ OPCODE(SF_cycleColors),
+ OPCODE(SF_centerActor),
+ OPCODE(SF_startAnim),
+ OPCODE(SF_actorWalkToAsync),
+ OPCODE(SF_enableZone),
+ OPCODE(SF_setActorState),
+ OPCODE(SF_moveTo),
+ OPCODE(SF_sceneEq),
+ OPCODE(SF_dropObject),
+ OPCODE(SF_finishBgdAnim),
+ OPCODE(SF_swapActors),
+ OPCODE(SF_simulSpeech),
+ OPCODE(SF_actorWalk),
+ OPCODE(SF_cycleActorFrames),
+ OPCODE(SF_setFrame),
+ OPCODE(SF_setRightPortrait),
+ OPCODE(SF_setLeftPortrait),
+ OPCODE(SF_linkAnim),
+ OPCODE(SF_scriptSpecialWalk),
+ OPCODE(SF_placeActor),
+ OPCODE(SF_checkUserInterrupt),
+ OPCODE(SF_walkRelative),
+ OPCODE(SF_moveRelative),
+ OPCODE(SF_simulSPeech2),
+ OPCODE(SF_placard),
+ OPCODE(SF_placardOff),
+ OPCODE(SF_setProtagState),
+ OPCODE(SF_resumeBgdAnim),
+ OPCODE(SF_throwActor),
+ OPCODE(SF_waitWalk),
+ OPCODE(SF_sceneID),
+ OPCODE(SF_changeActorScene),
+ OPCODE(SF_climb),
+ OPCODE(SF_setDoorState),
+ OPCODE(SF_setActorZ),
+ OPCODE(SF_text),
+ OPCODE(SF_getActorX),
+ OPCODE(SF_getActorY),
+ OPCODE(SF_eraseDelta),
+ OPCODE(SF_playMusic),
+ OPCODE(SF_pickClimbOutPos),
+ OPCODE(SF_tossRif),
+ OPCODE(SF_showControls),
+ OPCODE(SF_showMap),
+ OPCODE(SF_puzzleWon),
+ OPCODE(SF_enableEscape),
+ OPCODE(SF_playSound),
+ OPCODE(SF_playLoopedSound),
+ OPCODE(SF_getDeltaFrame),
+ OPCODE(SF_showProtect),
+ OPCODE(SF_protectResult),
+ OPCODE(SF_rand),
+ OPCODE(SF_fadeMusic),
+ OPCODE(SF_playVoice)
};
_SFuncList = SFuncList;
}
+// Script function #0 (0x00)
+int Script::SF_putString(SCRIPTFUNC_PARAMS) {
+ for (int i = 0; i < nArgs; i++)
+ thread->pop();
+
+ debug(1, "stub: SF_putString(), %d args", nArgs);
+ return SUCCESS;
+}
+
// Script function #1 (0x01) blocking
// Suspends thread execution for the specified time period
int Script::SF_sleep(SCRIPTFUNC_PARAMS) {
@@ -291,6 +300,15 @@
return _vm->_interface->setMode(kPanelDialogue);
}
+// Script function #13 (0x0D)
+int Script::SF_killActorThreads(SCRIPTFUNC_PARAMS) {
+ for (int i = 0; i < nArgs; i++)
+ thread->pop();
+
+ debug(1, "stub: SF_killActorThreads(), %d args", nArgs);
+ return SUCCESS;
+}
+
// Script function #14 (0x0E)
int Script::SF_faceTowards(SCRIPTFUNC_PARAMS) {
SDataWord_T param1 = thread->pop();
@@ -318,6 +336,60 @@
return SUCCESS;
}
+// Script function #17 (0x11)
+int Script::SF_setObjImage(SCRIPTFUNC_PARAMS) {
+ for (int i = 0; i < nArgs; i++)
+ thread->pop();
+
+ debug(1, "stub: SF_setObjImage(), %d args", nArgs);
+ return SUCCESS;
+}
+
+// Script function #18 (0x12)
+int Script::SF_setObjName(SCRIPTFUNC_PARAMS) {
+ for (int i = 0; i < nArgs; i++)
+ thread->pop();
+
+ debug(1, "stub: SF_setObjName(), %d args", nArgs);
+ return SUCCESS;
+}
+
+// Script function #19 (0x13)
+int Script::SF_getObjName(SCRIPTFUNC_PARAMS) {
+ for (int i = 0; i < nArgs; i++)
+ thread->pop();
+
+ debug(1, "stub: SF_getObjName(), %d args", nArgs);
+ return SUCCESS;
+}
+
+// Script function #20 (0x14)
+int Script::SF_getNumber(SCRIPTFUNC_PARAMS) {
+ for (int i = 0; i < nArgs; i++)
+ thread->pop();
+
+ debug(1, "stub: SF_getNumber(), %d args", nArgs);
+ return SUCCESS;
+}
+
+// Script function #21 (0x15)
+int Script::SF_openDoor(SCRIPTFUNC_PARAMS) {
+ for (int i = 0; i < nArgs; i++)
+ thread->pop();
+
+ debug(1, "stub: SF_openDoor(), %d args", nArgs);
+ return SUCCESS;
+}
+
+// Script function #22 (0x16)
+int Script::SF_closeDoor(SCRIPTFUNC_PARAMS) {
+ for (int i = 0; i < nArgs; i++)
+ thread->pop();
+
+ debug(1, "stub: SF_closeDoor(), %d args", nArgs);
+ return SUCCESS;
+}
+
// Script function #23 (0x17)
int Script::SF_setBgdAnimSpeed(SCRIPTFUNC_PARAMS) {
SDataWord_T param1 = thread->pop();
@@ -327,6 +399,15 @@
return SUCCESS;
}
+// Script function #24 (0x18)
+int Script::SF_cycleColors(SCRIPTFUNC_PARAMS) {
+ for (int i = 0; i < nArgs; i++)
+ thread->pop();
+
+ debug(1, "stub: SF_cycleColors(), %d args", nArgs);
+ return SUCCESS;
+}
+
// Script function #25 (0x19)
int Script::SF_centerActor(SCRIPTFUNC_PARAMS) {
SDataWord_T param = thread->pop();
@@ -395,6 +476,15 @@
return SUCCESS;
}
+// Script function #28 (0x1C)
+int Script::SF_enableZone(SCRIPTFUNC_PARAMS) {
+ for (int i = 0; i < nArgs; i++)
+ thread->pop();
+
+ debug(1, "stub: SF_enableZone(), %d args", nArgs);
+ return SUCCESS;
+}
+
// Script function #29 (0x1D)
int Script::SF_setActorState(SCRIPTFUNC_PARAMS) {
SDataWord_T param1 = thread->pop();
@@ -453,6 +543,15 @@
}
+// Script function #32 (0x20)
+int Script::SF_dropObject(SCRIPTFUNC_PARAMS) {
+ for (int i = 0; i < nArgs; i++)
+ thread->pop();
+
+ debug(1, "stub: SF_dropObject(), %d args", nArgs);
+ return SUCCESS;
+}
+
// Script function #33 (0x21)
int Script::SF_finishBgdAnim(SCRIPTFUNC_PARAMS) {
SDataWord_T param = thread->pop();
@@ -470,6 +569,15 @@
return SUCCESS;
}
+// Script function #35 (0x23)
+int Script::SF_simulSpeech(SCRIPTFUNC_PARAMS) {
+ for (int i = 0; i < nArgs; i++)
+ thread->pop();
+
+ debug(1, "stub: SF_simulSpeech(), %d args", nArgs);
+ return SUCCESS;
+}
+
// Script function #36 (0x24) ?
// Commands the specified actor to walk to the given position
// Param1: actor id
@@ -719,6 +827,15 @@
return SUCCESS;
}
+// Script function #47 (0x2F)
+int Script::SF_simulSPeech2(SCRIPTFUNC_PARAMS) {
+ for (int i = 0; i < nArgs; i++)
+ thread->pop();
+
+ debug(1, "stub: SF_simulSPeech2(), %d args", nArgs);
+ return SUCCESS;
+}
+
// Script function #48 (0x30)
int Script::SF_placard(SCRIPTFUNC_PARAMS) {
debug(1, "stub: SF_placard()");
@@ -731,6 +848,24 @@
return SUCCESS;
}
+// Script function #50 (0x32)
+int Script::SF_setProtagState(SCRIPTFUNC_PARAMS) {
+ for (int i = 0; i < nArgs; i++)
+ thread->pop();
+
+ debug(1, "stub: SF_setProtagState(), %d args", nArgs);
+ return SUCCESS;
+}
+
+// Script function #51 (0x33)
+int Script::SF_resumeBgdAnim(SCRIPTFUNC_PARAMS) {
+ for (int i = 0; i < nArgs; i++)
+ thread->pop();
+
+ debug(1, "stub: SF_resumeBgdAnim(), %d args", nArgs);
+ return SUCCESS;
+}
+
// Script function #52 (0x34)
int Script::SF_throwActor(SCRIPTFUNC_PARAMS) {
SDataWord_T param1 = thread->pop();
@@ -752,6 +887,15 @@
return SUCCESS;
}
+// 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);
+ return SUCCESS;
+}
+
// Script function #55 (0x37)
int Script::SF_changeActorScene(SCRIPTFUNC_PARAMS) {
SDataWord_T param1 = thread->pop();
@@ -772,6 +916,15 @@
return SUCCESS;
}
+// Script function #57 (0x39)
+int Script::SF_setDoorState(SCRIPTFUNC_PARAMS) {
+ for (int i = 0; i < nArgs; i++)
+ thread->pop();
+
+ debug(1, "stub: SF_setDoorState(), %d args", nArgs);
+ return SUCCESS;
+}
+
// Script function #58 (0x3A)
int Script::SF_setActorZ(SCRIPTFUNC_PARAMS) {
SDataWord_T param1 = thread->pop();
@@ -781,6 +934,15 @@
return SUCCESS;
}
+// Script function #59 (0x3B)
+int Script::SF_text(SCRIPTFUNC_PARAMS) {
+ for (int i = 0; i < nArgs; i++)
+ thread->pop();
+
+ debug(1, "stub: SF_text(), %d args", nArgs);
+ return SUCCESS;
+}
+
// Script function #60 (0x3C)
int Script::SF_getActorX(SCRIPTFUNC_PARAMS) {
SDataWord_T param = thread->pop();
@@ -797,6 +959,15 @@
return SUCCESS;
}
+// Script function #62 (0x3E)
+int Script::SF_eraseDelta(SCRIPTFUNC_PARAMS) {
+ for (int i = 0; i < nArgs; i++)
+ thread->pop();
+
+ debug(1, "stub: SF_eraseDelta(), %d args", nArgs);
+ return SUCCESS;
+}
+
// Script function #63 (0x3F)
int Script::SF_playMusic(SCRIPTFUNC_PARAMS) {
SDataWord_T param = thread->pop() + 9;
@@ -809,7 +980,52 @@
return SUCCESS;
}
-// Script function #69
+// Script function #64 (0x40)
+int Script::SF_pickClimbOutPos(SCRIPTFUNC_PARAMS) {
+ for (int i = 0; i < nArgs; i++)
+ thread->pop();
+
+ debug(1, "stub: SF_pickClimbOutPos(), %d args", nArgs);
+ return SUCCESS;
+}
+
+// Script function #65 (0x41)
+int Script::SF_tossRif(SCRIPTFUNC_PARAMS) {
+ for (int i = 0; i < nArgs; i++)
+ thread->pop();
+
+ debug(1, "stub: SF_tossRif(), %d args", nArgs);
+ return SUCCESS;
+}
+
+// Script function #66 (0x42)
+int Script::SF_showControls(SCRIPTFUNC_PARAMS) {
+ for (int i = 0; i < nArgs; i++)
+ thread->pop();
+
+ debug(1, "stub: SF_showControls(), %d args", nArgs);
+ return SUCCESS;
+}
+
+// Script function #67 (0x43)
+int Script::SF_showMap(SCRIPTFUNC_PARAMS) {
+ for (int i = 0; i < nArgs; i++)
+ thread->pop();
+
+ debug(1, "stub: SF_showMap(), %d args", nArgs);
+ return SUCCESS;
+}
+
+// Script function #68 (0x44)
+int Script::SF_puzzleWon(SCRIPTFUNC_PARAMS) {
+ for (int i = 0; i < nArgs; i++)
+ thread->pop();
+
+ debug(1, "stub: SF_puzzleWon(), %d args", nArgs);
+ return SUCCESS;
+}
+
+// Script function #69 (0x45)
int Script::SF_enableEscape(SCRIPTFUNC_PARAMS) {
if (thread->pop())
_abortEnabled = true;
@@ -904,6 +1120,42 @@
return SUCCESS;
}
+// Script function #71 (0x47)
+int Script::SF_playLoopedSound(SCRIPTFUNC_PARAMS) {
+ for (int i = 0; i < nArgs; i++)
+ thread->pop();
+
+ debug(1, "stub: SF_playLoopedSound(), %d args", nArgs);
+ return SUCCESS;
+}
+
+// Script function #72 (0x48)
+int Script::SF_getDeltaFrame(SCRIPTFUNC_PARAMS) {
+ for (int i = 0; i < nArgs; i++)
+ thread->pop();
+
+ debug(1, "stub: SF_getDeltaFrame(), %d args", nArgs);
+ return SUCCESS;
+}
+
+// Script function #73 (0x49)
+int Script::SF_showProtect(SCRIPTFUNC_PARAMS) {
+ for (int i = 0; i < nArgs; i++)
+ thread->pop();
+
+ debug(1, "stub: SF_showProtect(), %d args", nArgs);
+ return SUCCESS;
+}
+
+// Script function #74 (0x4A)
+int Script::SF_protectResult(SCRIPTFUNC_PARAMS) {
+ for (int i = 0; i < nArgs; i++)
+ thread->pop();
+
+ debug(1, "stub: SF_protectResult(), %d args", nArgs);
+ return SUCCESS;
+}
+
// Script function #75 (0x4d)
int Script::SF_rand(SCRIPTFUNC_PARAMS) {
SDataWord_T param = thread->pop();
@@ -919,4 +1171,13 @@
return SUCCESS;
}
+// Script function #77 (0x4d)
+int Script::SF_playVoice(SCRIPTFUNC_PARAMS) {
+ for (int i = 0; i < nArgs; i++)
+ thread->pop();
+
+ debug(1, "stub: SF_playVoice(), %d args", nArgs);
+ return SUCCESS;
+}
+
} // End of namespace Saga
Index: sthread.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sthread.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- sthread.cpp 28 Oct 2004 06:55:50 -0000 1.36
+++ sthread.cpp 6 Nov 2004 22:33:08 -0000 1.37
@@ -388,31 +388,22 @@
break;
}
- sfunc = _SFuncList[func_num].sfunc_fp;
- if (sfunc == NULL) {
- _vm->_console->print(S_WARN_PREFIX "%X: Undefined script function number: #%d (%X)\n",
- thread->i_offset, func_num, func_num);
- _vm->_console->print(S_WARN_PREFIX "Removing %d operand(s) from stack.\n", n_args);
- for (i = 0; i < n_args; i++) {
- thread->pop();
- }
- } else {
- sfuncRetVal = (this->*sfunc)(thread);
- if (sfuncRetVal != SUCCESS) {
- _vm->_console->print(S_WARN_PREFIX "%X: Script function %d failed.\n", thread->i_offset, func_num);
- }
+ sfunc = _SFuncList[func_num];
+ sfuncRetVal = (this->*sfunc)(thread, n_args);
+ if (sfuncRetVal != SUCCESS) {
+ _vm->_console->print(S_WARN_PREFIX "%X: Script function %d failed.\n", thread->i_offset, func_num);
+ }
- if (func_num == 16) { // SF_gotoScene
- instr_count = instr_limit; // break the loop
- break;
- }
+ if (func_num == 16) { // SF_gotoScene
+ instr_count = instr_limit; // break the loop
+ break;
+ }
- if (in_char == 0x18) // CALL function
- thread->push(thread->retVal);
+ if (in_char == 0x18) // CALL function
+ thread->push(thread->retVal);
- if (thread->flags & kTFlagAsleep)
- instr_count = instr_limit; // break out of loop!
- }
+ if (thread->flags & kTFlagAsleep)
+ instr_count = instr_limit; // break out of loop!
}
break;
case 0x1A: // (ENTR) Enter the dragon
More information about the Scummvm-git-logs
mailing list