[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.435,2.436 input.cpp,2.25,2.26 scumm.cpp,1.446,1.447 scumm.h,1.592,1.593

[Max Horn]

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

Modified Files:
	gfx.cpp input.cpp scumm.cpp scumm.h 
Log Message:
cleanup

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.435
retrieving revision 2.436
diff -u -d -r2.435 -r2.436
--- gfx.cpp	20 Apr 2005 18:20:55 -0000	2.435
+++ gfx.cpp	20 Apr 2005 19:59:01 -0000	2.436
@@ -1270,11 +1270,12 @@
 		if (_vm->_features & GF_SMALL_HEADER) {
 			if (_vm->_features & GF_16COLOR)
 				zplane_list[1] = ptr + READ_LE_UINT16(ptr);
-			else
+			else {
 				zplane_list[1] = ptr + READ_LE_UINT32(ptr);
-			if (_vm->_features & GF_OLD256) {
-				if (0 == READ_LE_UINT32(zplane_list[1]))
-					zplane_list[1] = 0;
+				if (_vm->_features & GF_OLD256) {
+					if (0 == READ_LE_UINT32(zplane_list[1]))
+						zplane_list[1] = 0;
+				}
 			}
 			for (i = 2; i < numzbuf; i++) {
 				zplane_list[i] = zplane_list[i-1] + READ_LE_UINT16(zplane_list[i-1]);
@@ -2582,19 +2583,13 @@
 			*dst = *src++;
 			NEXT_ROW;
 		}
-		return;
+	} else {
+		do {
+			memcpy(dst, src, 8);
+			dst += dstPitch;
+			src += 8;
+		} while (--height);
 	}
-
-	do {
-#if defined(SCUMM_NEED_ALIGNMENT)
-		memcpy(dst, src, 8);
-#else
-		((uint32 *)dst)[0] = ((const uint32 *)src)[0];
-		((uint32 *)dst)[1] = ((const uint32 *)src)[1];
-#endif
-		dst += dstPitch;
-		src += 8;
-	} while (--height);
 }
 
 void Gdi::unkDecode8(byte *dst, int dstPitch, const byte *src, int height) const {

Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/input.cpp,v
retrieving revision 2.25
retrieving revision 2.26
diff -u -d -r2.25 -r2.26
--- input.cpp	20 Apr 2005 18:20:57 -0000	2.25
+++ input.cpp	20 Apr 2005 19:59:16 -0000	2.26
@@ -35,6 +35,10 @@
 #include "scumm/scumm.h"
 #include "scumm/sound.h"
 
+#ifdef _WIN32_WCE
+#define		KEY_ALL_SKIP	3457
+#endif
+
 namespace Scumm {
 
 enum MouseButtonStatus {

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -d -r1.446 -r1.447
--- scumm.cpp	20 Apr 2005 18:21:06 -0000	1.446
+++ scumm.cpp	20 Apr 2005 19:59:16 -0000	1.447
@@ -104,13 +104,13 @@
 	/* Scumm Version 2 */
 
 	{"maniac", "Maniac Mansion", GID_MANIAC, 2, 0, 25, MDT_PCSPK,
-	 GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALING | GF_MULTIPLE_VERSIONS, Common::kPlatformUnknown, 0, 0},
+	 GF_SMALL_HEADER | GF_NO_SCALING | GF_16COLOR | GF_USE_KEY | GF_OLD_BUNDLE | GF_MULTIPLE_VERSIONS, Common::kPlatformUnknown, 0, 0},
 	{"zak",         "Zak McKracken and the Alien Mindbenders", GID_ZAK, 2, 0, 13, MDT_PCSPK,
-	 GF_SMALL_HEADER | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALING | GF_MULTIPLE_VERSIONS, Common::kPlatformUnknown, 0, 0},
+	 GF_SMALL_HEADER | GF_NO_SCALING | GF_16COLOR | GF_USE_KEY | GF_OLD_BUNDLE | GF_MULTIPLE_VERSIONS, Common::kPlatformUnknown, 0, 0},
 
 	/* Scumm Version 3 */
 	{"indy3EGA", "Indiana Jones and the Last Crusade", GID_INDY3, 3, 0, 13, MDT_PCSPK | MDT_ADLIB,
-	 GF_SMALL_HEADER | GF_NO_SCALING | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE, Common::kPlatformUnknown, 0, 0},
+	 GF_SMALL_HEADER | GF_NO_SCALING | GF_16COLOR | GF_USE_KEY | GF_OLD_BUNDLE, Common::kPlatformUnknown, 0, 0},
 	{"indy3Towns", "Indiana Jones and the Last Crusade (FM-TOWNS)", GID_INDY3, 3, 0, 13, MDT_TOWNS,
 	 GF_SMALL_HEADER | GF_NO_SCALING | GF_OLD256 | GF_FEW_LOCALS | GF_AUDIOTRACKS, Common::kPlatformFMTowns, 0, 0},
 	{"indy3", "Indiana Jones and the Last Crusade (256)", GID_INDY3, 3, 0, 13, MDT_PCSPK | MDT_ADLIB,
@@ -119,7 +119,7 @@
 	{"zakTowns", "Zak McKracken and the Alien Mindbenders (FM-TOWNS)", GID_ZAK256, 3, 0, 13, MDT_TOWNS,
 	 GF_SMALL_HEADER | GF_NO_SCALING | GF_OLD256 | GF_AUDIOTRACKS, Common::kPlatformFMTowns, 0, 0},
 	{"loom", "Loom", GID_LOOM, 3, 0, 13, MDT_PCSPK | MDT_ADLIB | MDT_NATIVE,
-	 GF_SMALL_HEADER | GF_NO_SCALING | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE, Common::kPlatformUnknown, 0, 0},
+	 GF_SMALL_HEADER | GF_NO_SCALING | GF_16COLOR | GF_USE_KEY | GF_OLD_BUNDLE, Common::kPlatformUnknown, 0, 0},
 	{"loomTowns", "Loom (FM Towns)", GID_LOOM, 3, 0, 13, MDT_TOWNS,
 	 GF_SMALL_HEADER | GF_NO_SCALING | GF_OLD256 | GF_AUDIOTRACKS, Common::kPlatformFMTowns, 0, 0},
 

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.592
retrieving revision 1.593
diff -u -d -r1.592 -r1.593
--- scumm.h	20 Apr 2005 18:21:07 -0000	1.592
+++ scumm.h	20 Apr 2005 19:59:17 -0000	1.593
@@ -68,8 +68,7 @@
 /* System Wide Constants */
 enum {
 	NUM_SENTENCE = 6,
-	NUM_SHADOW_PALETTE = 8,
-	KEY_ALL_SKIP = 3457   // WinCE
+	NUM_SHADOW_PALETTE = 8
 };
 
 /**
@@ -99,7 +98,7 @@
 	/** EGA games. */
 	GF_16COLOR             = 1 << 7,
 
-	/** VGA versions of V3 games. */
+	/** VGA versions of V3 games.  Equivalent to (version == 3 && not GF_16COLOR) */
 	GF_OLD256              = 1 << 8,
 
 	/** Games which have Audio CD tracks. */