[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,1.64,1.65

[Nicolas Bacca]

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

Modified Files:
	gfx.cpp 
Log Message:
Daily alignment fix :)

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- gfx.cpp	27 Nov 2002 14:39:48 -0000	1.64
+++ gfx.cpp	27 Nov 2002 22:45:36 -0000	1.65
@@ -609,7 +609,11 @@
 			do {
 				j = _flashlight.w / 4;
 				do {
+#if defined(SCUMM_NEED_ALIGNMENT)
+					memset(_flashlight.buffer, 0, sizeof(uint32));
+#else		
 					*(uint32 *)_flashlight.buffer = 0;
+#endif
 					_flashlight.buffer += 4;
 				} while (--j);
 				_flashlight.buffer += offset;
@@ -1165,8 +1169,12 @@
 			if (!(maskbits & 0x01))
 				dst[7] = src[7];
 		} else {
+#if defined(SCUMM_NEED_ALIGNMENT)
+			memcpy(dst, src, 2 * sizeof(uint32));
+#else
 			((uint32 *)dst)[0] = ((uint32 *)src)[0];
 			((uint32 *)dst)[1] = ((uint32 *)src)[1];
+#endif
 		}
 		src += _vm->_realWidth;
 		dst += _vm->_realWidth;
@@ -1201,8 +1209,12 @@
 			if (!(maskbits & 0x01))
 				dst[7] = 0;
 		} else {
+#if defined(SCUMM_NEED_ALIGNMENT)
+			memset(dst, 0, 2 * sizeof(uint32));
+#else
 			((uint32 *)dst)[0] = 0;
 			((uint32 *)dst)[1] = 0;
+#endif
 		}
 		dst += _vm->_realWidth;
 		mask += _numStrips;
@@ -1215,8 +1227,12 @@
 	byte *dst = _backbuff_ptr;
 
 	do {
+#if defined(SCUMM_NEED_ALIGNMENT)
+		memset(dst, 0, 2 * sizeof(uint32));
+#else
 		((uint32 *)dst)[0] = 0;
 		((uint32 *)dst)[1] = 0;
+#endif
 		dst += _vm->_realWidth;
 	} while (--height);
 }
@@ -1590,7 +1606,7 @@
 	do {
 		/* Endian safe */
 #if defined(SCUMM_NEED_ALIGNMENT)
-		memcpy(dst, src, 8);
+		memcpy(dst, src, 2 * sizeof(uint32));
 #else
 		((uint32 *)dst)[0] = ((uint32 *)src)[0];
 		((uint32 *)dst)[1] = ((uint32 *)src)[1];