[Scummvm-cvs-logs] CVS: scummvm/simon charset.cpp,1.27,1.27.2.1

Nicolas Bacca arisme at users.sourceforge.net
Thu Aug 12 23:20:01 CEST 2004


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

Modified Files:
      Tag: branch-0-6-0
	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.27
retrieving revision 1.27.2.1
diff -u -d -r1.27 -r1.27.2.1
--- charset.cpp	6 Jan 2004 12:45:31 -0000	1.27
+++ charset.cpp	13 Aug 2004 06:19:02 -0000	1.27.2.1
@@ -79,8 +79,16 @@
 
 	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 +178,16 @@
 
 	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);





More information about the Scummvm-git-logs mailing list