diff options
| -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; |