Fix MI1 floppy scaling, and update readme.

svn-id: r4077

3 files changed, 14 insertions, 13 deletions

diff --git a/gameDetector.cpp b/gameDetector.cpp
index 831ab2dde2..4ce9ef2c1b 100644
--- a/gameDetector.cpp
+++ b/gameDetector.cpp
@@ -267,7 +267,7 @@ static const VersionSettings version_settings[] = {
 
 	/* Scumm version 5 */
 	{"monkeyVGA", "Monkey Island 1 (256 color Floppy version)", GID_MONKEY_VGA,  5, 0, 16,
-	 GF_SMALL_HEADER | GF_USE_KEY | GF_AUDIOTRACKS | GF_ADLIB_DEFAULT},
+	 GF_SMALL_HEADER | GF_USE_KEY | GF_AUDIOTRACKS | GF_ADLIB_DEFAULT | GF_NO_SCALLING},
 	{"loomcd", "Loom (256 color CD version)", GID_LOOM256, 5, 1, 42,
 	 GF_SMALL_HEADER | GF_USE_KEY | GF_AUDIOTRACKS | GF_ADLIB_DEFAULT},
 	{"monkey", "Monkey Island 1", GID_MONKEY, 5, 2, 2,
diff --git a/readme.txt b/readme.txt
index 72e75a7d56..948a7aed91 100644
--- a/readme.txt
+++ b/readme.txt
@@ -39,20 +39,22 @@ be playable to the end:
         Simon The Sorcerer                     [Game: simon1dos or simon1win]
 
 
-The following games should load, but are not yet fully playable. If you want
+The following games should load, but are not yet fully playable. Play these at
+your own risk, and please do not file bug reports about them. If you want
 the latest updates on game compatibility, visit our website and view the
 compatibility chart.
 
-	Zak McKraken (256 color FM Towns version)
-	Indiana Jones and the Last Crusade (256 color version)
-        Full Throttle
-        The Dig
+        Monkey Island 1 (VGA floppy)                   [Game: monkeyvga]
+        Zak McKraken (256 color FM Towns version)      [Game: zak256]
+        Indiana Jones and the Last Crusade (256 color) [Game: indy3]
+        Full Throttle                                  [Game: ft]
+        The Dig                                        [Game: dig]
 
 The following games are SCUMM engine, but NOT supported by ScummVM (yet).
 
 	Maniac Mansion
 	Zak McKraken (16 color floppy version)
-	Monkey Island (16 color floppy version)
+        Monkey Island 1 (EGA, 16 color floppy version)
 	Loom (16 color floppy version)
 	Curse of Monkey Island
 
@@ -348,6 +350,7 @@ Credits:
         Janne Huttunen    - Zak256/Indy256/LoomCD actor mask support
         Jeroen Janssen    - Numerous readability and bugfix patches
         Gregory Montoir   - AdvanceMAME Scale-2X implementation
+        Mikesch Nepomuk   - MI1 VGA Floppy patches.
         Edward Rudd       - Fixes for playing MP3 versions of MI1/Loom Audio
         Daniel Schepler   - Final MI1 CD music support
         Tim 'realmz'      - Initial MI1 CD music support
diff --git a/script_v1.cpp b/script_v1.cpp
index df8dad2e49..4b0b0c711e 100644
--- a/script_v1.cpp
+++ b/script_v1.cpp
@@ -778,15 +778,13 @@ void Scumm::o5_actorSet()
 			a->width = getVarOrDirectByte(0x80);
 			break;
 		case 17:										/* scale */
-			// FIXME: 0x11 is definitly an one byte opcode in MI1 256 col Floppy !
-			//              but it's not 1, 9, 16, 19, 22 or 23 (testet), what else ?
 			if (_gameId & GID_MONKEY_VGA) {
-				warning("o5_actorset: unk opcode 0x11 (%d)", getVarOrDirectByte(0x80));
-				break;
+				a->scalex = a->scaley = getVarOrDirectByte(0x80);
+			} else {
+				a->scalex = getVarOrDirectByte(0x80);
+				a->scaley = getVarOrDirectByte(0x40);
 			}
 
-			a->scalex = getVarOrDirectByte(0x80);
-			a->scaley = getVarOrDirectByte(0x40);
 			if (a->scalex > 255 || a->scaley > 255)
 				error("Setting an bad actor scale!");
 			a->needRedraw = true;