thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Let IHNM run again. It has 105 script functions.

Browse source 
svn-id: r16653
This commit is contained in:
Eugene Sandulenko 2005-01-28 03:47:12 +00:00
parent ad53c8c9a4
commit 285f6a6a2b
3 changed files with 37 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
saga/script.h
View file

@ -46,7 +46,7 @@ namespace Saga {
#define S_ERROR_PREFIX "SError: "
#define S_WARN_PREFIX "SWarning: "
#define SCRIPT_FUNCTION_MAX 78
#define SCRIPT_FUNCTION_MAX 104
#define DEFAULT_THREAD_STACK_SIZE 256
enum AddressTypes {
@ -534,6 +534,7 @@ private:
void sfRand(SCRIPTFUNC_PARAMS);
void SF_fadeMusic(SCRIPTFUNC_PARAMS);
void SF_playVoice(SCRIPTFUNC_PARAMS);
void SF_stub(SCRIPTFUNC_PARAMS);
};
} // End of namespace Saga

35
saga/sfuncs.cpp
View file

@ -126,7 +126,33 @@ void Script::setupScriptFuncList(void) {
OPCODE(SF_protectResult),
OPCODE(sfRand),
OPCODE(SF_fadeMusic),
OPCODE(SF_playVoice)
OPCODE(SF_playVoice),
OPCODE(SF_stub),
OPCODE(SF_stub),
OPCODE(SF_stub),
OPCODE(SF_stub),
OPCODE(SF_stub),
OPCODE(SF_stub),
OPCODE(SF_stub),
OPCODE(SF_stub),
OPCODE(SF_stub),
OPCODE(SF_stub),
OPCODE(SF_stub),
OPCODE(SF_stub),
OPCODE(SF_stub),
OPCODE(SF_stub),
OPCODE(SF_stub),
OPCODE(SF_stub),
OPCODE(SF_stub),
OPCODE(SF_stub),
OPCODE(SF_stub),
OPCODE(SF_stub),
OPCODE(SF_stub),
OPCODE(SF_stub),
OPCODE(SF_stub),
OPCODE(SF_stub),
OPCODE(SF_stub),
OPCODE(SF_stub)
};
_scriptFunctionsList = scriptFunctionsList;
}
@ -1561,4 +1587,11 @@ void Script::finishDialog(int replyID, int flags, int bitOffset) {
wakeUpThreads(kWaitTypeDialogBegin);
}
void Script::SF_stub(SCRIPTFUNC_PARAMS) {
for (int i = 0; i < nArgs; i++)
thread->pop();
debug(1, "stub: SF_stub(), %d args", nArgs);
}
} // End of namespace Saga

2
saga/sthread.cpp
View file

@ -313,7 +313,7 @@ void Script::runThread(ScriptThread *thread, uint instructionLimit) {
argumentsCount = scriptS.readByte();
functionNumber = scriptS.readUint16LE();
if (functionNumber >= SCRIPT_FUNCTION_MAX) {
error("Script::runThread() Invalid script function number");
error("Script::runThread() Invalid script function number (%d)", functionNumber);
}
debug(8, "Calling 0x%X %s", functionNumber, _scriptFunctionsList[functionNumber].scriptFunctionName);