aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEugene Sandulenko2009-01-11 11:16:37 +0000
committerEugene Sandulenko2009-01-11 11:16:37 +0000
commitbc19c31d75d080256c70ca47e45a4e78e1ef0a86 (patch)
treee4d8f6fe996c2fabe2b7538327534c9a1ccb31e5 /engines
parent138c1936a4be0b7c7644a0ca81b3492cf986e08d (diff)
downloadscummvm-rg350-bc19c31d75d080256c70ca47e45a4e78e1ef0a86.tar.gz
scummvm-rg350-bc19c31d75d080256c70ca47e45a4e78e1ef0a86.tar.bz2
scummvm-rg350-bc19c31d75d080256c70ca47e45a4e78e1ef0a86.zip
Patch from bugreport #1846746: "PUTTMOON 3DO: Play button in Outtro partly cut off"
svn-id: r35823
Diffstat (limited to 'engines')
-rw-r--r--engines/scumm/detection_tables.h3
-rw-r--r--engines/scumm/script_v6.cpp8
-rw-r--r--engines/scumm/scumm.h1
3 files changed, 11 insertions, 1 deletions
diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index 9981f23cd7..d5ef6a8c83 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -251,7 +251,8 @@ static const GameSettings gameVariantsTable[] = {
{"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},
diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index f05db291e0..5d318c4572 100644
--- a/engines/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
@@ -920,6 +920,14 @@ void ScummEngine_v6::o6_drawObjectAt() {
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);
}
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index 065b941165..e843c201a7 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -219,6 +219,7 @@ enum ScummGameId {
GID_HEGAME, // Generic name for all HE games with default behaviour
GID_PUTTDEMO,
GID_FBEAR,
+ GID_PUTTMOON,
GID_FUNPACK,
GID_FREDDI3,
GID_BIRTHDAY,