diff options
Diffstat (limited to 'scumm/script_v5.cpp')
| -rw-r--r-- | scumm/script_v5.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index 1f2afdd98f..f624eec045 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -2348,10 +2348,12 @@ void Scumm_v5::o5_wait() _opcode = fetchScriptByte(); switch (_opcode & 0x1F) { - case 1: /* wait for actor */ - if (derefActorSafe(getVarOrDirectByte(0x80), "o5_wait")->moving) - break; - return; + case 1: { /* wait for actor */ + Actor *a = derefActorSafe(getVarOrDirectByte(0x80), "o5_wait"); + if (a && a->isInCurrentRoom() && a->moving) + break; + return; + } case 2: /* wait for message */ if (_vars[VAR_HAVE_MSG]) break; |