Ticket #9229: walkbox-ladder.patch

actor.cpp

@@ -691 +691 @@
 int Actor::remapDirection(int dir, bool is_walking) {
         int specdir;
         byte flags;
+        byte mask;
         bool flipX;
         bool flipY;
 
@@ -769 +770 @@
                 case 6:
                         return 180;
                 }
+
+                // MM C64 stores flags as a part of the mask
+                if (_vm->_game.version == 0) {
+                        mask = _vm->getMaskFromBox(_walkbox);
+                        // face the wall if climbing/descending a ladder
+                        if ((mask & 0x8C) == 0x84)
+                                return 0;
+                }
         }
         // OR 1024 in to signal direction interpolation should be done
         return normalizeAngle(dir) | 1024;

boxes.cpp

@@ -614 +614 @@
                 box->lr.x = bp->c64.x2;
                 box->lr.y = bp->c64.y2;
 
-                if (bp->c64.mask & 0x88) {
+                if ((bp->c64.mask & 0x88) == 0x88) {
                         // walkbox for (right/left) corner
-                        // TODO: ladders (incl. man-eating plant) have mask 0x8A,
-                        // must those walkboxes be adjusted?
                         if (bp->c64.mask & 0x04)
                                 box->ur = box->ul;
                         else