libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-06 10:17:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Workaround for bug #746349

Browse Source 
svn-id: r8157
This commit is contained in:
Max Horn 2003-05-30 22:22:51 +00:00
parent 32b6333b74
commit 877ca1b859
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scumm/script_v5.cpp
View File

@ -940,6 +940,15 @@ void Scumm_v5::o5_getActorMoving() {
void Scumm_v5::o5_getActorRoom() {
getResultPos();
int act = getVarOrDirectByte(0x80);
// FIXME: Workaround for bug #746349. This is a really odd bu
//in either the script or in our script engine. Might be a good
// idea to investigate this further by e.g. looking at the FOA
// engine a bit closer.
if (_gameId == GID_INDY4 && _roomResource == 94 && vm.slot[_currentScript].number == 206 && act > _numActors) {
setResult(0);
return;
}
Actor *a = derefActor(act, "o5_getActorRoom");
setResult(a->room);
}
@ -1049,7 +1058,7 @@ void Scumm_v5::o5_getDist() {
o2 = getVarOrDirectWord(0x40);
r = getObjActToObjActDist(o1, o2);
// FIXME: MI2 race workaround, see bug 597022
// FIXME: MI2 race workaround, see bug #597022
if (_gameId == GID_MONKEY2 && vm.slot[_currentScript].number == 40 && r < 60)
r = 60;
@ -2011,20 +2020,13 @@ void Scumm_v5::o5_startObject() {
void Scumm_v5::o5_startScript() {
int op, script;
int data[16];
int a, b;
op = _opcode;
script = getVarOrDirectByte(0x80);
getWordVararg(data);
a = b = 0;
if (op & 0x40)
b = 1;
if (op & 0x20)
a = 1;
runScript(script, a != 0, b != 0, data);
runScript(script, (op & 0x20) != 0, (op & 0x40) != 0, data);
}
void Scumm_v5::o5_stopObjectCode() {