diff options
| author | James Brown | 2002-04-05 04:14:47 +0000 |
|---|---|---|
| committer | James Brown | 2002-04-05 04:14:47 +0000 |
| commit | ce4a1eb8433074fcd599e59d7f7fc01c7922b08a (patch) | |
| tree | 04fb1c1808e80272a1d5f8c4827794120b7b8c95 | |
| parent | 327581fb6320efe7c1ef04da60f100f1a8d28e6a (diff) | |
| download | scummvm-rg350-ce4a1eb8433074fcd599e59d7f7fc01c7922b08a.tar.gz scummvm-rg350-ce4a1eb8433074fcd599e59d7f7fc01c7922b08a.tar.bz2 scummvm-rg350-ce4a1eb8433074fcd599e59d7f7fc01c7922b08a.zip | |
Remove (hopefully) obsolete Indy4 FIXME's
svn-id: r3865
| -rw-r--r-- | script_v1.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/script_v1.cpp b/script_v1.cpp index 786a0b6f16..2dfa4a8c94 100644 --- a/script_v1.cpp +++ b/script_v1.cpp @@ -1218,8 +1218,7 @@ void Scumm::o5_getActorRoom() { int temp; getResultPos(); temp=getVarOrDirectByte(0x80); - if(temp>30 && _gameId==GID_INDY4) - temp=1; + setResult(derefActorSafe(temp,"o5_getActorRoom")->room); } @@ -1287,9 +1286,6 @@ void Scumm::o5_getDist() { o2 = getVarOrDirectWord(0x40); r = getObjActToObjActDist(o1,o2); - if ((_gameId==GID_INDY4) && (o2 == 1212)) /* Fix for FOA, another odd bug */ - r = 0; - /* Fix for monkey 2, dunno what's wrong in scummvm */ if (_gameId==GID_MONKEY2 && vm.slot[_currentScript].number==40 && r<60) r=60; |