Ticket #9170: bug2823309.patch

engines/scumm/script_v6.cpp

@@ -745 +745 @@
                 return;
         }
 
+        // WORKAROUND bug #2823309: With a few objects in CoMI, examining with the
+        // 'e' key instead of the verb coin while walking leads to guybrush walking
+        // in place while the sound-clip of his observation plays. This seems to
+        // be the case only with objects that do not enforce a walk-to point on Guybrush
+        // before he examines them. This is a manual override that detects if the player
+        // is examining one of these known objects and makes Guybrush stop walking at the
+        // start of the script.
+        if (_game.id == GID_CMI &&
+                ((script == 204 && _currentRoom == 15 && vm.slot[_currentScript].number == 421) ||
+                (script == 38 && (_currentRoom == 60 || _currentRoom == 22) &&
+                vm.slot[_currentScript].number == 32))) {
+
+                Actor* guybrush = derefActor(1, "bug 2823309 workaround");
+                guybrush->stopActorMoving();
+                guybrush->startAnimActor(guybrush->_standFrame);
+
+        }
+
         // WORKAROUND bug #1878514: When turning pages in the recipe book
         // (found on Blood Island), there is a brief moment where it displays
         // text from two different pages at the same time.