[Scummvm-cvs-logs] CVS: scummvm gameDetector.cpp,1.33,1.34 readme.txt,1.32,1.33 script_v1.cpp,1.91,1.92

[James Brown]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv27221

Modified Files:
	gameDetector.cpp readme.txt script_v1.cpp 
Log Message:
Fix MI1 floppy scaling, and update readme.


Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetector.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** gameDetector.cpp	25 Apr 2002 03:37:56 -0000	1.33
--- gameDetector.cpp	25 Apr 2002 04:12:18 -0000	1.34
***************
*** 268,272 ****
  	/* 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},
  	{"loomcd", "Loom (256 color CD version)", GID_LOOM256, 5, 1, 42,
  	 GF_SMALL_HEADER | GF_USE_KEY | GF_AUDIOTRACKS | GF_ADLIB_DEFAULT},
--- 268,272 ----
  	/* 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_NO_SCALLING},
  	{"loomcd", "Loom (256 color CD version)", GID_LOOM256, 5, 1, 42,
  	 GF_SMALL_HEADER | GF_USE_KEY | GF_AUDIOTRACKS | GF_ADLIB_DEFAULT},

Index: readme.txt
===================================================================
RCS file: /cvsroot/scummvm/scummvm/readme.txt,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** readme.txt	24 Apr 2002 07:42:29 -0000	1.32
--- readme.txt	25 Apr 2002 04:12:18 -0000	1.33
***************
*** 40,51 ****
  
  
! The following games should load, but are not yet fully playable. 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
  
  The following games are SCUMM engine, but NOT supported by ScummVM (yet).
--- 40,53 ----
  
  
! 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.
  
!         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).
***************
*** 53,57 ****
  	Maniac Mansion
  	Zak McKraken (16 color floppy version)
! 	Monkey Island (16 color floppy version)
  	Loom (16 color floppy version)
  	Curse of Monkey Island
--- 55,59 ----
  	Maniac Mansion
  	Zak McKraken (16 color floppy version)
!         Monkey Island 1 (EGA, 16 color floppy version)
  	Loom (16 color floppy version)
  	Curse of Monkey Island
***************
*** 349,352 ****
--- 351,355 ----
          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

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** script_v1.cpp	25 Apr 2002 03:37:56 -0000	1.91
--- script_v1.cpp	25 Apr 2002 04:12:18 -0000	1.92
***************
*** 779,791 ****
  			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 = getVarOrDirectByte(0x80);
- 			a->scaley = getVarOrDirectByte(0x40);
  			if (a->scalex > 255 || a->scaley > 255)
  				error("Setting an bad actor scale!");
--- 779,789 ----
  			break;
  		case 17:										/* scale */
  			if (_gameId & GID_MONKEY_VGA) {
! 				a->scalex = a->scaley = getVarOrDirectByte(0x80);
! 			} else {
! 				a->scalex = getVarOrDirectByte(0x80);
! 				a->scaley = getVarOrDirectByte(0x40);
  			}
  
  			if (a->scalex > 255 || a->scaley > 255)
  				error("Setting an bad actor scale!");