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

added workaround for scriptbug (fixes ending sequence).

Browse Source 
Sword1 is completable now with some graphical glitches left to fix.

svn-id: r11841
This commit is contained in:
Robert Göffringmann 2003-12-21 21:58:36 +00:00
parent d2bfdd8116
commit 7def9b7efb
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sword1/logic.cpp
View File

@ -192,8 +192,15 @@ void SwordLogic::processLogic(BsObject *compact, uint32 id) {
break;
case LOGIC_bookmark:
memcpy(&(compact->o_tree.o_script_level), &(compact->o_bookmark.o_script_level), sizeof(ScriptTree));
compact->o_logic = LOGIC_script;
logicRet = 1;
if (id == GMASTER_79) {
// workaround for ending script.
// GMASTER_79 is not prepared for mega_interact receiving INS_quit
fnSuicide(compact, id, 0, 0, 0, 0, 0, 0);
logicRet = 0;
} else {
compact->o_logic = LOGIC_script;
logicRet = 1;
}
break;
case LOGIC_speech:
logicRet = speechDriver(compact);
@ -600,7 +607,7 @@ int SwordLogic::interpretScript(BsObject *compact, int id, Header *scriptModule,
}
break;
case IT_SKIPONTRUE: // skip if expression true
debug(9, "IT_SKIPONFALSE: %d (%s)", scriptCode[pc], (stack[stackIdx-1] ? "IS TRUE (SKIPPED)" : "IS FALSE (NOT SKIPPED)"));
debug(9, "IT_SKIPONTRUE: %d (%s)", scriptCode[pc], (stack[stackIdx-1] ? "IS TRUE (SKIPPED)" : "IS FALSE (NOT SKIPPED)"));
stackIdx--;
if (stack[stackIdx])
pc += scriptCode[pc];
@ -856,8 +863,7 @@ int SwordLogic::fnFadeDown(BsObject *cpt, int32 id, int32 speed, int32 d, int32
}
int SwordLogic::fnFadeUp(BsObject *cpt, int32 id, int32 speed, int32 d, int32 e, int32 f, int32 z, int32 x) {
warning("fnFadeUp speed = %d", speed);
//_screen->fadeUpPalette();
_scriptVars[NEW_PALETTE] = 1;
return SCRIPT_CONT;
}

1
sword1/sworddefs.h
View File

@ -1533,6 +1533,7 @@ enum ScriptVariableNames {
POCKET_52
};
#define GMASTER_79 5177345
#define SCR_std_off (0*0x10000 + 6)
#define SCR_exit0 (0*0x10000 + 7)
#define SCR_exit1 (0*0x10000 + 8)