diff options
| -rw-r--r-- | engines/scumm/script_v6.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp index 538a4f5285..e1f39635f0 100644 --- a/engines/scumm/script_v6.cpp +++ b/engines/scumm/script_v6.cpp @@ -2231,21 +2231,8 @@ void ScummEngine_v6::o6_wait() { break; return; case 232: // SO_WAIT_FOR_TURN - // FIXME: This opcode is really odd. It's used a lot in The Dig. - // But sometimes it receives the actor ID as params, and sometimes an - // angle. However in (almost?) all cases, just before calling it, _curActor - // is set, so we can use it. I tried to add code that detects if an angle - // is passed, and if so, wait till that angle is reached, but that leads to hangs. - // It would be very good if somebody could disassmble the original code - // for this opcode so that we could figure out what's really going on here. - // - // For now, if the value passed in is divisible by 45, assume it is an - // angle, and use _curActor as the actor to wait for. offs = fetchScriptWordSigned(); actnum = pop(); - if (actnum % 45 == 0) { - actnum = _curActor; - } a = derefActor(actnum, "o6_wait:232b"); if (a->isInCurrentRoom() && a->_moving & MF_TURN) break; |