Ticket #8143: parrot-fix3.diff

scummvm/scumm/script_v1.cpp

@@ -2330 +2330 @@
                 _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;

scummvm/scumm/script_v2.cpp

@@ -2032 +2032 @@
 {
         switch (fetchScriptByte()) {
         case 168:{
+                        Actor *a = derefActorSafe(pop(), "o6_wait");
                         int offs = (int16)fetchScriptWord();
-                        if (derefActorSafe(pop(), "o6_wait")->moving) {
+                        if (a && a->isInCurrentRoom() && a->moving) {
                                 _scriptPointer += offs;
                                 o6_breakHere();
                         }