[Scummvm-cvs-logs] SF.net SVN: scummvm:[35823] scummvm/trunk/engines/scumm

[sev at users.sourceforge.net]

Revision: 35823
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35823&view=rev
Author:   sev
Date:     2009-01-11 11:16:37 +0000 (Sun, 11 Jan 2009)

Log Message:
-----------
Patch from bugreport #1846746: "PUTTMOON 3DO: Play button in Outtro partly cut off"

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/detection_tables.h
    scummvm/trunk/engines/scumm/script_v6.cpp
    scummvm/trunk/engines/scumm/scumm.h

Modified: scummvm/trunk/engines/scumm/detection_tables.h
===================================================================
--- scummvm/trunk/engines/scumm/detection_tables.h	2009-01-11 11:15:16 UTC (rev 35822)
+++ scummvm/trunk/engines/scumm/detection_tables.h	2009-01-11 11:16:37 UTC (rev 35823)
@@ -251,7 +251,8 @@
 	{"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},

Modified: scummvm/trunk/engines/scumm/script_v6.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v6.cpp	2009-01-11 11:15:16 UTC (rev 35822)
+++ scummvm/trunk/engines/scumm/script_v6.cpp	2009-01-11 11:16:37 UTC (rev 35823)
@@ -920,6 +920,14 @@
 	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);
 }
 

Modified: scummvm/trunk/engines/scumm/scumm.h
===================================================================
--- scummvm/trunk/engines/scumm/scumm.h	2009-01-11 11:15:16 UTC (rev 35822)
+++ scummvm/trunk/engines/scumm/scumm.h	2009-01-11 11:16:37 UTC (rev 35823)
@@ -219,6 +219,7 @@
 	GID_HEGAME,      // Generic name for all HE games with default behaviour
 	GID_PUTTDEMO,
 	GID_FBEAR,
+	GID_PUTTMOON,
 	GID_FUNPACK,
 	GID_FREDDI3,
 	GID_BIRTHDAY,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.