Context Navigation

Ticket #831: actor_distance.diff

File actor_distance.diff, 825 bytes (added by eriktorbjorn, 21 years ago)
Patch against a May 30 CVS snapshot

diff -ur ScummVM+orig/scummvm/scumm/object.cpp ScummVM+hack/scummvm/scumm/object.cpp

-              old
+              new
         if (y > x)
                 x = y;
         return x;
+        return (_features & GF_AFTER_V2) ? x / 8 : x;
+}
 int Scumm::findObject(int x, int y) {

diff -ur ScummVM+orig/scummvm/scumm/script_v5.cpp ScummVM+hack/scummvm/scumm/script_v5.cpp

-              old
+              new
         if (_gameId == GID_MONKEY2 && vm.slot[_currentScript].number == 40 && r < 60)
                 r = 60;
-        if (_features & GF_AFTER_V2)
-                r /= 8;
         setResult(r);
+}