libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-01 08:23:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Renamed SF_getObjName() to SF_getObjImage() and unstubbed it. (Untested)

Browse Source 
svn-id: r15728
This commit is contained in:
Torbjörn Andersson 2004-11-07 15:35:42 +00:00
parent d6cfbdad21
commit 073d0680e1
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
saga/script.h
View File

@ -270,7 +270,7 @@ private:
int SF_gotoScene(SCRIPTFUNC_PARAMS);
int SF_setObjImage(SCRIPTFUNC_PARAMS);
int SF_setObjName(SCRIPTFUNC_PARAMS);
int SF_getObjName(SCRIPTFUNC_PARAMS);
int SF_getObjImage(SCRIPTFUNC_PARAMS);
int SF_getNumber(SCRIPTFUNC_PARAMS);
int SF_openDoor(SCRIPTFUNC_PARAMS);
int SF_closeDoor(SCRIPTFUNC_PARAMS);

27
saga/sfuncs.cpp
View File

@ -65,7 +65,7 @@ void Script::setupScriptFuncList(void) {
OPCODE(SF_gotoScene),
OPCODE(SF_setObjImage),
OPCODE(SF_setObjName),
OPCODE(SF_getObjName),
OPCODE(SF_getObjImage),
OPCODE(SF_getNumber),
OPCODE(SF_openDoor),
OPCODE(SF_closeDoor),
@ -365,19 +365,30 @@ int Script::SF_setObjImage(SCRIPTFUNC_PARAMS) {
// Script function #18 (0x12)
int Script::SF_setObjName(SCRIPTFUNC_PARAMS) {
for (int i = 0; i < nArgs; i++)
thread->pop();
SDataWord_T obj_param = thread->pop();
SDataWord_T name_param = thread->pop();
debug(1, "stub: SF_setObjName(), %d args", nArgs);
int index = obj_param & 0x1FFF;
if (index >= ARRAYSIZE(ObjectTable)) {
return FAILURE;
}
ObjectTable[index].nameIndex = name_param;
return SUCCESS;
}
// Script function #19 (0x13)
int Script::SF_getObjName(SCRIPTFUNC_PARAMS) {
for (int i = 0; i < nArgs; i++)
thread->pop();
int Script::SF_getObjImage(SCRIPTFUNC_PARAMS) {
SDataWord_T param = thread->pop();
int index = param & 0x1FFF;
debug(1, "stub: SF_getObjName(), %d args", nArgs);
if (index >= ARRAYSIZE(ObjectTable)) {
thread->retVal = 0;
return FAILURE;
}
thread->retVal = ObjectTable[index].spritelistRn;
return SUCCESS;
}