[Scummvm-cvs-logs] CVS: scummvm/simon charset.cpp,1.28,1.29

[Nicolas Bacca]

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

Modified Files:
	charset.cpp 
Log Message:
Alignment fix for WinCE (fix bug #934343)

Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/charset.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- charset.cpp	31 Jul 2004 10:14:05 -0000	1.28
+++ charset.cpp	13 Aug 2004 06:10:39 -0000	1.29
@@ -79,8 +79,15 @@
 
 	src += vga_sprite_id * 8;
 	dst += READ_BE_UINT32(src);
+#ifndef _WIN32_WCE
 	*(uint16 *)(dst + 4) = TO_BE_16(height);
 	*(uint16 *)(dst + 6) = TO_BE_16(width);
+#else
+	uint16 data = TO_BE_16(height);
+	memcpy(dst + 4, &data, 2);
+	data = TO_BE_16(width);
+	memcpy(dst + 6, &data, 2);
+#endif
 
 	uint charsize = width/8 * height;
 	memset(dst, 0, count);
@@ -170,8 +177,15 @@
 
 	p = dst + vga_sprite_id * 8;
 
+#ifndef _WIN32_WCE
 	*(uint16 *)(p + 4) = TO_BE_16(height);
 	*(uint16 *)(p + 6) = TO_BE_16(width);
+#else
+	uint16 data = TO_BE_16(height);
+	memcpy(p + 4, &data, 2);
+	data = TO_BE_16(width);
+	memcpy(p + 6, &data, 2);
+#endif
 	dst += READ_BE_UINT32(p);
 
 	memset(dst, 0, count);