Ticket #8165: cmi-untrap.diff

scummvm/scumm/actor.h

@@ -127 +127 @@
 
         void setBox(int box);
         int updateActorDirection(bool is_walking);
-        void adjustActorPos();
 
 public:
+        void adjustActorPos();
         AdjustBoxResult adjustXYToBeInBox(int dstX, int dstY, int pathfrom);
 
         void setDirection(int direction);

scummvm/scumm/intern.h

@@ -416 +416 @@
         void o8_blastText();
 
         void o8_cursorCommand();
+        void o8_createBoxMatrix();
         void o8_resourceRoutines();
         void o8_roomOps();
         void o8_actorOps();

scummvm/scumm/script_v8.cpp

@@ -249 +249 @@
                 OPCODE(o6_pickupObject),
                 OPCODE(o6_setBoxFlags),
                 /* A8 */
-                OPCODE(o6_createBoxMatrix),
+                OPCODE(o8_createBoxMatrix),
                 OPCODE(o6_invalid),
                 OPCODE(o8_resourceRoutines),
                 OPCODE(o8_roomOps),
@@ -865 +865 @@
         _vars[VAR_USERPUT] = _userPut;
 }
 
+void Scumm_v8::o8_createBoxMatrix()
+{
+        Actor *a;
+
+        createBoxMatrix();
+
+        // FIXME: Is this the right thing to do? In CMI, Guybrush gets trapped
+        // in an invisible walkbox when room-9-2000 changes the walkbox flags,
+        // and this is an attempt to set him right again.
+        warning("o8_createBoxMatrix: Adjusting ego actor position");
+        a = derefActorSafe(_vars[VAR_EGO], "o8_createBoxMatrix");
+        if (a)
+                a->adjustActorPos();
+}
+
 void Scumm_v8::o8_resourceRoutines()
 {
         // TODO