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

[Nicolas Bacca]

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

Modified Files:
      Tag: branch-0-6-0
	charset.cpp 
Log Message:
Apply Max suggestion :)

Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/charset.cpp,v
retrieving revision 1.27.2.1
retrieving revision 1.27.2.2
diff -u -d -r1.27.2.1 -r1.27.2.2
--- charset.cpp	13 Aug 2004 06:19:02 -0000	1.27.2.1
+++ charset.cpp	13 Aug 2004 16:43:44 -0000	1.27.2.2
@@ -80,15 +80,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);
@@ -178,15 +171,8 @@
 
 	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);