aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2003-05-04 18:27:55 +0000
committerMax Horn2003-05-04 18:27:55 +0000
commit7d78ba39fbc133631258ffa489b81524defe6af0 (patch)
tree4f100e95f5ab168d3072eb67ef6a57e8aff66b42
parent5b08534324ce1a708d22bf1e6e415990614a2108 (diff)
downloadscummvm-rg350-7d78ba39fbc133631258ffa489b81524defe6af0.tar.gz
scummvm-rg350-7d78ba39fbc133631258ffa489b81524defe6af0.tar.bz2
scummvm-rg350-7d78ba39fbc133631258ffa489b81524defe6af0.zip
simplified code
svn-id: r7324
-rw-r--r--scumm/script_v6.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index b0a98e3c0e..f312c25492 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -423,16 +423,16 @@ void Scumm::writeArray(int array, int idx, int base, int value) {
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