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

[Nicolas Bacca]

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

Modified Files:
	charset.cpp 
Log Message:
Apply Max suggestion :)

Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/charset.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- charset.cpp	13 Aug 2004 06:10:39 -0000	1.29
+++ charset.cpp	13 Aug 2004 16:40:54 -0000	1.30
@@ -79,15 +79,8 @@
 
 	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
+	WRITE_BE_UINT16(dst + 4, height);
+	WRITE_BE_UINT16(dst + 6, width);
 
 	uint charsize = width/8 * height;
 	memset(dst, 0, count);
@@ -177,15 +170,9 @@
 
 	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
+	WRITE_BE_UINT16(p + 4, height);
+	WRITE_BE_UINT16(p + 6, width);
+	
 	dst += READ_BE_UINT32(p);
 
 	memset(dst, 0, count);