[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.102,1.103
Max Horn
fingolfin at users.sourceforge.net
Sun May 4 11:30:39 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv1572
Modified Files:
script_v6.cpp
Log Message:
simplified code
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- script_v6.cpp 4 May 2003 17:21:31 -0000 1.102
+++ script_v6.cpp 4 May 2003 18:27:55 -0000 1.103
@@ -423,16 +423,16 @@
if (ah->type == 4) {
ah->data[base] = value;
} else if (_features & GF_AFTER_V8) {
-#if defined(SCUMM_NEED_ALIGNMENT)
+#if 1 || defined(SCUMM_NEED_ALIGNMENT)
uint32 tmp = TO_LE_32(value);
- memcpy(&((char *)ah->data)[base*sizeof(uint32)], &tmp, 4);
+ memcpy(&ah->data[base*4], &tmp, 4);
#else
((uint32 *)ah->data)[base] = TO_LE_32(value);
#endif
} else {
-#if defined(SCUMM_NEED_ALIGNMENT)
+#if 1 || defined(SCUMM_NEED_ALIGNMENT)
uint16 tmp = TO_LE_16(value);
- memcpy(&((char *)ah->data)[base*sizeof(uint16)], &tmp, 2);
+ memcpy(&ah->data[base*2], &tmp, 2);
#else
((uint16 *)ah->data)[base] = TO_LE_16(value);
#endif
More information about the Scummvm-git-logs
mailing list