Ticket #3487: patch.diff

engines/scumm/detection_tables.h

@@ -251 +251 @@
         {"fbear", "HE 61", 0, GID_FBEAR, 6, 61, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK},
         {"fbear", "HE 70", 0, GID_FBEAR, 6, 70, MDT_NONE,             GF_USE_KEY, Common::kPlatformWindows},
 
-        {"puttmoon", "", 0, GID_HEGAME,  6, 61, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK},
+        {"puttmoon", "", 0, GID_PUTTMOON, 6, 61, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK},
+        {"puttmoon", "HE 70", 0, GID_PUTTMOON, 6, 70, MDT_NONE,             GF_USE_KEY, Common::kPlatformWindows},
 
         {"puttputt", "HE 61", 0, GID_HEGAME,   6, 61, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK},
         {"puttputt", "HE 60", 0, GID_HEGAME,   6, 60, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, Common::kPlatformPC},

engines/scumm/scumm.h

@@ -219 +219 @@
         GID_HEGAME,      // Generic name for all HE games with default behaviour
         GID_PUTTDEMO,
         GID_FBEAR,
+        GID_PUTTMOON,
         GID_FUNPACK,
         GID_FREDDI3,
         GID_BIRTHDAY,

engines/scumm/script_v6.cpp

@@ -920 +920 @@
         int y = pop();
         int x = pop();
         int obj = pop();
+
+        // WORKAROUND bug #1846746 : Adjust x and y position of
+        // objects in credits sequence, to match other ports
+        if (_game.id == GID_PUTTMOON && _game.platform == Common::kPlatform3DO &&
+                _roomResource == 38 && vm.slot[_currentScript].number == 206) {
+                x = y = -1;
+        }
+
         setObjectState(obj, 1, x, y);
 }