- removed returning value from scriptFunctions
- implement some scriptFunctions svn-id: r16618
This commit is contained in:
Andrew Kurushin
parent
8543306e56
commit
01a863414e
4 changed files with 269 additions and 295 deletions
|
|
@ -41,6 +41,8 @@ namespace Saga {
|
|||
#define RID_IHNMDEMO_SCRIPT_LUT 18
|
||||
|
||||
// SCENES
|
||||
#define ITE_SCENE_INV -1
|
||||
|
||||
#define ITE_DEFAULT_SCENE 32
|
||||
|
||||
// FONTS
|
||||
|
|
|
|||
159
saga/script.h
159
saga/script.h
|
|
@ -444,7 +444,7 @@ public:
|
|||
|
||||
private:
|
||||
|
||||
typedef int (Script::*ScriptFunctionType)(SCRIPTFUNC_PARAMS);
|
||||
typedef void (Script::*ScriptFunctionType)(SCRIPTFUNC_PARAMS);
|
||||
|
||||
struct ScriptFunctionDescription {
|
||||
ScriptFunctionType scriptFunction;
|
||||
|
|
@ -455,84 +455,85 @@ private:
|
|||
void setupScriptFuncList(void);
|
||||
int SDebugPrintInstr(ScriptThread *thread);
|
||||
|
||||
int SF_putString(SCRIPTFUNC_PARAMS);
|
||||
int sfWait(SCRIPTFUNC_PARAMS);
|
||||
int SF_takeObject(SCRIPTFUNC_PARAMS);
|
||||
int SF_objectIsCarried(SCRIPTFUNC_PARAMS);
|
||||
int sfStatusBar(SCRIPTFUNC_PARAMS);
|
||||
int SF_mainMode(SCRIPTFUNC_PARAMS);
|
||||
int sfScriptWalkTo(SCRIPTFUNC_PARAMS);
|
||||
int SF_doAction(SCRIPTFUNC_PARAMS);
|
||||
int sfSetActorFacing(SCRIPTFUNC_PARAMS);
|
||||
int sfStartBgdAnim(SCRIPTFUNC_PARAMS);
|
||||
int sfStopBgdAnim(SCRIPTFUNC_PARAMS);
|
||||
int sfLockUser(SCRIPTFUNC_PARAMS);
|
||||
int SF_preDialog(SCRIPTFUNC_PARAMS);
|
||||
int SF_killActorThreads(SCRIPTFUNC_PARAMS);
|
||||
int sfFaceTowards(SCRIPTFUNC_PARAMS);
|
||||
int sfSetFollower(SCRIPTFUNC_PARAMS);
|
||||
int SF_gotoScene(SCRIPTFUNC_PARAMS);
|
||||
int SF_setObjImage(SCRIPTFUNC_PARAMS);
|
||||
int SF_setObjName(SCRIPTFUNC_PARAMS);
|
||||
int SF_getObjImage(SCRIPTFUNC_PARAMS);
|
||||
int SF_getNumber(SCRIPTFUNC_PARAMS);
|
||||
int sfScriptOpenDoor(SCRIPTFUNC_PARAMS);
|
||||
int sfScriptCloseDoor(SCRIPTFUNC_PARAMS);
|
||||
int sfSetBgdAnimSpeed(SCRIPTFUNC_PARAMS);
|
||||
int SF_cycleColors(SCRIPTFUNC_PARAMS);
|
||||
int sfDoCenterActor(SCRIPTFUNC_PARAMS);
|
||||
int sfStartBgdAnimSpeed(SCRIPTFUNC_PARAMS);
|
||||
int sfScriptWalkToAsync(SCRIPTFUNC_PARAMS);
|
||||
int SF_enableZone(SCRIPTFUNC_PARAMS);
|
||||
int sfSetActorState(SCRIPTFUNC_PARAMS);
|
||||
int scriptMoveTo(SCRIPTFUNC_PARAMS);
|
||||
int SF_sceneEq(SCRIPTFUNC_PARAMS);
|
||||
int SF_dropObject(SCRIPTFUNC_PARAMS);
|
||||
int sfFinishBgdAnim(SCRIPTFUNC_PARAMS);
|
||||
int sfSwapActors(SCRIPTFUNC_PARAMS);
|
||||
int sfSimulSpeech(SCRIPTFUNC_PARAMS);
|
||||
int sfScriptWalk(SCRIPTFUNC_PARAMS);
|
||||
int sfCycleFrames(SCRIPTFUNC_PARAMS);
|
||||
int sfSetFrame(SCRIPTFUNC_PARAMS);
|
||||
int sfSetPortrait(SCRIPTFUNC_PARAMS);
|
||||
int sfSetProtagPortrait(SCRIPTFUNC_PARAMS);
|
||||
int sfChainBgdAnim(SCRIPTFUNC_PARAMS);
|
||||
int SF_scriptSpecialWalk(SCRIPTFUNC_PARAMS);
|
||||
int sfPlaceActor(SCRIPTFUNC_PARAMS);
|
||||
int SF_checkUserInterrupt(SCRIPTFUNC_PARAMS);
|
||||
int SF_walkRelative(SCRIPTFUNC_PARAMS);
|
||||
int SF_moveRelative(SCRIPTFUNC_PARAMS);
|
||||
int SF_simulSpeech2(SCRIPTFUNC_PARAMS);
|
||||
int sfPlacard(SCRIPTFUNC_PARAMS);
|
||||
int sfPlacardOff(SCRIPTFUNC_PARAMS);
|
||||
int SF_setProtagState(SCRIPTFUNC_PARAMS);
|
||||
int sfResumeBgdAnim(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 sfSetDoorState(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 sfPlayMusic(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 sfEnableEscape(SCRIPTFUNC_PARAMS);
|
||||
int sfPlaySound(SCRIPTFUNC_PARAMS);
|
||||
int SF_playLoopedSound(SCRIPTFUNC_PARAMS);
|
||||
int SF_getDeltaFrame(SCRIPTFUNC_PARAMS);
|
||||
int SF_showProtect(SCRIPTFUNC_PARAMS);
|
||||
int SF_protectResult(SCRIPTFUNC_PARAMS);
|
||||
int sfRand(SCRIPTFUNC_PARAMS);
|
||||
int SF_fadeMusic(SCRIPTFUNC_PARAMS);
|
||||
int SF_playVoice(SCRIPTFUNC_PARAMS);
|
||||
void sfPutString(SCRIPTFUNC_PARAMS);
|
||||
void sfWait(SCRIPTFUNC_PARAMS);
|
||||
void sfTakeObject(SCRIPTFUNC_PARAMS);
|
||||
void sfIsCarried(SCRIPTFUNC_PARAMS);
|
||||
void sfStatusBar(SCRIPTFUNC_PARAMS);
|
||||
void sfMainMode(SCRIPTFUNC_PARAMS);
|
||||
void sfScriptWalkTo(SCRIPTFUNC_PARAMS);
|
||||
void sfScriptDoAction(SCRIPTFUNC_PARAMS);
|
||||
void sfSetActorFacing(SCRIPTFUNC_PARAMS);
|
||||
void sfStartBgdAnim(SCRIPTFUNC_PARAMS);
|
||||
void sfStopBgdAnim(SCRIPTFUNC_PARAMS);
|
||||
void sfLockUser(SCRIPTFUNC_PARAMS);
|
||||
void sfPreDialog(SCRIPTFUNC_PARAMS);
|
||||
void sfKillActorThreads(SCRIPTFUNC_PARAMS);
|
||||
|
||||
void sfFaceTowards(SCRIPTFUNC_PARAMS);
|
||||
void sfSetFollower(SCRIPTFUNC_PARAMS);
|
||||
void SF_gotoScene(SCRIPTFUNC_PARAMS);
|
||||
void SF_setObjImage(SCRIPTFUNC_PARAMS);
|
||||
void SF_setObjName(SCRIPTFUNC_PARAMS);
|
||||
void SF_getObjImage(SCRIPTFUNC_PARAMS);
|
||||
void SF_getNumber(SCRIPTFUNC_PARAMS);
|
||||
void sfScriptOpenDoor(SCRIPTFUNC_PARAMS);
|
||||
void sfScriptCloseDoor(SCRIPTFUNC_PARAMS);
|
||||
void sfSetBgdAnimSpeed(SCRIPTFUNC_PARAMS);
|
||||
void SF_cycleColors(SCRIPTFUNC_PARAMS);
|
||||
void sfDoCenterActor(SCRIPTFUNC_PARAMS);
|
||||
void sfStartBgdAnimSpeed(SCRIPTFUNC_PARAMS);
|
||||
void sfScriptWalkToAsync(SCRIPTFUNC_PARAMS);
|
||||
void SF_enableZone(SCRIPTFUNC_PARAMS);
|
||||
void sfSetActorState(SCRIPTFUNC_PARAMS);
|
||||
void scriptMoveTo(SCRIPTFUNC_PARAMS);
|
||||
void SF_sceneEq(SCRIPTFUNC_PARAMS);
|
||||
void SF_dropObject(SCRIPTFUNC_PARAMS);
|
||||
void sfFinishBgdAnim(SCRIPTFUNC_PARAMS);
|
||||
void sfSwapActors(SCRIPTFUNC_PARAMS);
|
||||
void sfSimulSpeech(SCRIPTFUNC_PARAMS);
|
||||
void sfScriptWalk(SCRIPTFUNC_PARAMS);
|
||||
void sfCycleFrames(SCRIPTFUNC_PARAMS);
|
||||
void sfSetFrame(SCRIPTFUNC_PARAMS);
|
||||
void sfSetPortrait(SCRIPTFUNC_PARAMS);
|
||||
void sfSetProtagPortrait(SCRIPTFUNC_PARAMS);
|
||||
void sfChainBgdAnim(SCRIPTFUNC_PARAMS);
|
||||
void SF_scriptSpecialWalk(SCRIPTFUNC_PARAMS);
|
||||
void sfPlaceActor(SCRIPTFUNC_PARAMS);
|
||||
void SF_checkUserInterrupt(SCRIPTFUNC_PARAMS);
|
||||
void SF_walkRelative(SCRIPTFUNC_PARAMS);
|
||||
void SF_moveRelative(SCRIPTFUNC_PARAMS);
|
||||
void SF_simulSpeech2(SCRIPTFUNC_PARAMS);
|
||||
void sfPlacard(SCRIPTFUNC_PARAMS);
|
||||
void sfPlacardOff(SCRIPTFUNC_PARAMS);
|
||||
void SF_setProtagState(SCRIPTFUNC_PARAMS);
|
||||
void sfResumeBgdAnim(SCRIPTFUNC_PARAMS);
|
||||
void SF_throwActor(SCRIPTFUNC_PARAMS);
|
||||
void SF_waitWalk(SCRIPTFUNC_PARAMS);
|
||||
void SF_sceneID(SCRIPTFUNC_PARAMS);
|
||||
void SF_changeActorScene(SCRIPTFUNC_PARAMS);
|
||||
void SF_climb(SCRIPTFUNC_PARAMS);
|
||||
void sfSetDoorState(SCRIPTFUNC_PARAMS);
|
||||
void SF_setActorZ(SCRIPTFUNC_PARAMS);
|
||||
void SF_text(SCRIPTFUNC_PARAMS);
|
||||
void SF_getActorX(SCRIPTFUNC_PARAMS);
|
||||
void SF_getActorY(SCRIPTFUNC_PARAMS);
|
||||
void SF_eraseDelta(SCRIPTFUNC_PARAMS);
|
||||
void sfPlayMusic(SCRIPTFUNC_PARAMS);
|
||||
void SF_pickClimbOutPos(SCRIPTFUNC_PARAMS);
|
||||
void SF_tossRif(SCRIPTFUNC_PARAMS);
|
||||
void SF_showControls(SCRIPTFUNC_PARAMS);
|
||||
void SF_showMap(SCRIPTFUNC_PARAMS);
|
||||
void SF_puzzleWon(SCRIPTFUNC_PARAMS);
|
||||
void sfEnableEscape(SCRIPTFUNC_PARAMS);
|
||||
void sfPlaySound(SCRIPTFUNC_PARAMS);
|
||||
void SF_playLoopedSound(SCRIPTFUNC_PARAMS);
|
||||
void SF_getDeltaFrame(SCRIPTFUNC_PARAMS);
|
||||
void SF_showProtect(SCRIPTFUNC_PARAMS);
|
||||
void SF_protectResult(SCRIPTFUNC_PARAMS);
|
||||
void sfRand(SCRIPTFUNC_PARAMS);
|
||||
void SF_fadeMusic(SCRIPTFUNC_PARAMS);
|
||||
void SF_playVoice(SCRIPTFUNC_PARAMS);
|
||||
};
|
||||
|
||||
} // End of namespace Saga
|
||||
|
|
|
|||
397
saga/sfuncs.cpp
397
saga/sfuncs.cpp
File diff suppressed because it is too large
Load diff
|
|
@ -177,7 +177,6 @@ void Script::runThread(ScriptThread *thread, uint instructionLimit) {
|
|||
|
||||
byte argumentsCount;
|
||||
uint16 functionNumber;
|
||||
int scriptFunctionReturnValue;
|
||||
ScriptFunctionType scriptFunction;
|
||||
|
||||
int debug_print = 0;
|
||||
|
|
@ -319,10 +318,7 @@ void Script::runThread(ScriptThread *thread, uint instructionLimit) {
|
|||
|
||||
debug(8, "Calling 0x%X %s", functionNumber, _scriptFunctionsList[functionNumber].scriptFunctionName);
|
||||
scriptFunction = _scriptFunctionsList[functionNumber].scriptFunction;
|
||||
scriptFunctionReturnValue = (this->*scriptFunction)(thread, argumentsCount);
|
||||
if (scriptFunctionReturnValue != SUCCESS) { // TODO: scriptFunctionReturnValue should be ignored & removed
|
||||
_vm->_console->DebugPrintf(S_WARN_PREFIX "%X: Script function %d failed.\n", thread->_instructionOffset, scriptFunctionReturnValue);
|
||||
}
|
||||
(this->*scriptFunction)(thread, argumentsCount);
|
||||
|
||||
if (functionNumber == 16) { // SF_gotoScene
|
||||
instructionCount = instructionLimit; // break the loop
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue