[Scummvm-cvs-logs] CVS: scummvm/simon charset.cpp,1.29,1.30
Nicolas Bacca
arisme at users.sourceforge.net
Fri Aug 13 09:42:01 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.293.2.23,1.293.2.24 script_v6he.cpp,2.15.2.8,2.15.2.9 sound.cpp,1.320.2.9,1.320.2.10 sound.h,1.62.2.2,1.62.2.3
- Next message: [Scummvm-cvs-logs] CVS: scummvm/simon charset.cpp,1.27.2.1,1.27.2.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
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);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.293.2.23,1.293.2.24 script_v6he.cpp,2.15.2.8,2.15.2.9 sound.cpp,1.320.2.9,1.320.2.10 sound.h,1.62.2.2,1.62.2.3
- Next message: [Scummvm-cvs-logs] CVS: scummvm/simon charset.cpp,1.27.2.1,1.27.2.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list