[Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.287,1.288 scumm.cpp,1.542,1.543

[Gregory Montoir]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8097

Modified Files:
	script_v5.cpp scumm.cpp 
Log Message:
Based on indy4demo FMTowns, some minor changes to SO_ROOM_FADE

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -d -r1.287 -r1.288
--- script_v5.cpp	4 Jun 2005 23:02:54 -0000	1.287
+++ script_v5.cpp	7 Jun 2005 20:44:19 -0000	1.288
@@ -1921,6 +1921,26 @@
 	case 10:	// SO_ROOM_FADE
 		a = getVarOrDirectWord(PARAM_1);
 		if (a) {
+			if (_platform == Common::kPlatformFMTowns) {
+				switch (a) {
+				case 8: // compose kMainVirtScreen over a screen buffer
+				case 9: // call 0x110:0x20 _ax=0x601 _edx=2
+				case 10: // call 0x110:0x20 _ax=0x601 _edx=3
+				case 11: // clear screen 0x1C:0x45000 sizeof(640 * 320)
+				case 12: // call 0x110:0x20 _ax=0x601 _edx=0
+				case 13: // call 0x110:0x20 _ax=0x601 _edx=1
+				case 16: // enable clearing of a screen buffer in drawBitmap()
+				case 17: // disable clearing of a screen buffer in drawBitmap()
+				case 18: // clear a screen buffer
+				case 19: // enable palette operations (palManipulate(), cyclePalette() etc.)
+				case 20: // disable palette operations
+				case 21: // disable clearing of screen 0x1C:0x5000 sizeof(640 * 320) in initScreens()
+				case 22: // enable clearing of screen 0x1C:0x5000 sizeof(640 * 320) in initScreens()
+					warning("o5_roomOps: unhandled FM-TOWNS fadeEffect %d", a);
+					return;
+					break;
+				}
+			}
 			_switchRoomEffect = (byte)(a & 0xFF);
 			_switchRoomEffect2 = (byte)(a >> 8);
 		} else {

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.542
retrieving revision 1.543
diff -u -d -r1.542 -r1.543
--- scumm.cpp	4 Jun 2005 06:30:23 -0000	1.542
+++ scumm.cpp	7 Jun 2005 20:44:19 -0000	1.543
@@ -161,9 +161,9 @@
 	{"fate", "Indiana Jones and the Fate of Atlantis (Demo)", GID_INDY4, 5, 0, MDT_ADLIB | MDT_NATIVE,
 	 GF_USE_KEY, Common::kPlatformPC, 0, 0},
 	{"indy4", "Indiana Jones and the Fate of Atlantis (FM-TOWNS)", GID_INDY4, 5, 0, MDT_ADLIB | MDT_NATIVE,
-	 GF_USE_KEY, Common::kPlatformPC, 0, 0},
+	 GF_USE_KEY, Common::kPlatformFMTowns, 0, 0},
 	{"indydemo", "Indiana Jones and the Fate of Atlantis (FM-TOWNS Demo)", GID_INDY4, 5, 0, MDT_ADLIB | MDT_NATIVE,
-	 GF_USE_KEY, Common::kPlatformPC, 0, 0},
+	 GF_USE_KEY, Common::kPlatformFMTowns, 0, 0},
 
 	/* Scumm Version 6 */
 	{"tentacle", "Day Of The Tentacle", GID_TENTACLE, 6, 0, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE,