Ticket #9233: v0_mm_ObjectFix_WalkFix.patch

actor.cpp

@@ -1043 +1043 @@
         // yDist must be divided by 4, as we are using 8x2 pixels
         // blocks for actor coordinates).
         int xDist = ABS(x - destX);
-        int yDist = ABS(y - destY) / 4;
+        int yDist;
         int dist;
 
+        // MM C64: This fixes the trunk bug (#3070065), as well
+        // as the fruit bowl, however im not sure if its 
+        // the proper solution or not.
+        if( g_scumm->_game.version == 0 )
+                yDist = ABS(y - destY);
+        else
+                yDist = ABS(y - destY) / 4;
+
         if (xDist < yDist)
                 dist = (xDist >> 1) + yDist;
         else
@@ -1073 +1081 @@
                         abr.x = foundX;
                         abr.y = foundY;
                         abr.box = box;
+
                         break;
                 }
                 if (dist < bestDist) {

object.cpp

@@ -315 +315 @@
                 return -1;
 
         for (i = (_numLocalObjects-1); i > 0; i--) {
+                if (_game.version == 0 )
+                        if( _objs[i].flags != _v0ObjectFlag )
+                                continue;
+
                 if (_objs[i].obj_nr == object)
                         return i;
         }
@@ -512 +516 @@
                         if (_game.version <= 2 && _objs[i].state & kObjectStateUntouchable)
                                 continue;
                 }
-
+                
                 b = i;
                 do {
                         a = _objs[b].parentstate;
@@ -526 +530 @@
 #endif
                                 if (_objs[i].x_pos <= x && _objs[i].width + _objs[i].x_pos > x &&
                                     _objs[i].y_pos <= y && _objs[i].height + _objs[i].y_pos > y) {
+                                        // MMC64: Set the object search flag
+                                        if (_game.version == 0)
+                                                _v0ObjectFlag = _objs[i].flags;
                                         if (_game.version == 0 && _v0ObjectIndex)
                                                 return i;
                                         else

script_v0.cpp

@@ -987 +987 @@
 void ScummEngine_v0::resetSentence(bool walking) {
         _activeVerb = 13;
 
-        if (!walking) {
+        // If the actor is walking, or the screen is a keypad (no sentence verbs/objects are drawn)
+        // Then reset all active objects (stops the radio crash, bug #3077966)
+        if (!walking || !(_userState & 32)) {
+                _v0ObjectFlag = 0;
                 _activeInventory = 0;
                 _activeObject = 0;
                 _activeObject2 = 0;

script_v2.cpp

@@ -1174 +1174 @@
         int obj;
         Actor *a;
 
+        _v0ObjectFlag = 0;
+
         a = derefActor(getVarOrDirectByte(PARAM_1), "o2_walkActorToObject");
         obj = getVarOrDirectWord(PARAM_2);
         if (whereIsObject(obj) != WIO_NOT_FOUND) {
@@ -1182 +1184 @@
                 AdjustBoxResult r = a->adjustXYToBeInBox(x, y);
                 x = r.x;
                 y = r.y;
+
                 a->startWalkActor(x, y, dir);
         }
 }

scumm.cpp

@@ -145 +145 @@
         // Init all vars
         _v0ObjectIndex = false;
         _v0ObjectInInventory = false;
+        _v0ObjectFlag = 0;
         _imuse = NULL;
         _imuseDigital = NULL;
         _musicEngine = NULL;

scumm.h

@@ -591 +591 @@
 
         bool _v0ObjectIndex;                    // V0 Use object index, instead of object number
         bool _v0ObjectInInventory;              // V0 Use object number from inventory
+        byte _v0ObjectFlag;
 
         /* Global resource tables */
         int _numVariables, _numBitVariables, _numLocalObjects;