[Scummvm-cvs-logs] CVS: scummvm/scumm/smush blitter.cpp,1.5,1.6

[Nicolas Bacca]

Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1:/tmp/cvs-serv3290

Modified Files:
	blitter.cpp 
Log Message:
Rewrite ifdefs

Index: blitter.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/blitter.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- blitter.cpp	16 Nov 2002 00:09:56 -0000	1.5
+++ blitter.cpp	27 Nov 2002 22:46:10 -0000	1.6
@@ -203,28 +203,28 @@
 void Blitter::blockCopy(int32 offset) {
 	if(_cur.getX() + 3 < _src.right() && _cur.getY() + 3 < _src.bottom()) {// This is clipping
 		byte * dst = _offset;
-#ifndef _WIN32_WCE
-		*((uint32 *)dst) = *((uint32 *)(dst + offset));
-#else
+#if defined(SCUMM_NEED_ALIGNMENT)
 		memcpy(dst, dst + offset, sizeof(uint32));
+#else
+		*((uint32 *)dst) = *((uint32 *)(dst + offset));
 #endif
 		dst += _clip.getX();
-#ifndef _WIN32_WCE
-		*((uint32 *)dst) = *((uint32 *)(dst + offset));
-#else
+#if defined(SCUMM_NEED_ALIGNMENT)
 		memcpy(dst, dst + offset, sizeof(uint32));
+#else
+		*((uint32 *)dst) = *((uint32 *)(dst + offset));
 #endif
 		dst += _clip.getX();
-#ifndef _WIN32_WCE
-		*((uint32 *)dst) = *((uint32 *)(dst + offset));
-#else
+#if defined(SCUMM_NEED_ALIGNMENT)
 		memcpy(dst, dst + offset, sizeof(uint32));
+#else
+		*((uint32 *)dst) = *((uint32 *)(dst + offset));
 #endif
 		dst += _clip.getX();
-#ifndef _WIN32_WCE
-		*((uint32 *)dst) = *((uint32 *)(dst + offset));
-#else
+#if defined(SCUMM_NEED_ALIGNMENT)
 		memcpy(dst, dst + offset, sizeof(uint32));
+#else
+		*((uint32 *)dst) = *((uint32 *)(dst + offset));
 #endif
 #ifdef DEBUG_CLIPPER
 	} else {