aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorNicolas Bacca2002-11-27 22:46:10 +0000
committerNicolas Bacca2002-11-27 22:46:10 +0000
commit4492aebd099e5dee78281ae97ec1ee8496a12539 (patch)
tree3b7df1b2ca7424fadf09657bda8b59fb6104077d /scumm
parentf53051c2961fb9afed753342709ede6e4288ee7d (diff)
downloadscummvm-rg350-4492aebd099e5dee78281ae97ec1ee8496a12539.tar.gz
scummvm-rg350-4492aebd099e5dee78281ae97ec1ee8496a12539.tar.bz2
scummvm-rg350-4492aebd099e5dee78281ae97ec1ee8496a12539.zip
Rewrite ifdefs
svn-id: r5732
Diffstat (limited to 'scumm')
-rw-r--r--scumm/smush/blitter.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/scumm/smush/blitter.cpp b/scumm/smush/blitter.cpp
index 7adaa6cc5c..290c97a16d 100644
--- a/scumm/smush/blitter.cpp
+++ b/scumm/smush/blitter.cpp
@@ -203,28 +203,28 @@ void Blitter::putBlock(Chunk & src) {
void Blitter::blockCopy(int32 offset) {
if(_cur.getX() + 3 < _src.right() && _cur.getY() + 3 < _src.bottom()) {// This is clipping
byte * dst = _offset;
-#ifndef _WIN32_WCE
- *((uint32 *)dst) = *((uint32 *)(dst + offset));
-#else
+#if defined(SCUMM_NEED_ALIGNMENT)
memcpy(dst, dst + offset, sizeof(uint32));
+#else
+ *((uint32 *)dst) = *((uint32 *)(dst + offset));
#endif
dst += _clip.getX();
-#ifndef _WIN32_WCE
- *((uint32 *)dst) = *((uint32 *)(dst + offset));
-#else
+#if defined(SCUMM_NEED_ALIGNMENT)
memcpy(dst, dst + offset, sizeof(uint32));
+#else
+ *((uint32 *)dst) = *((uint32 *)(dst + offset));
#endif
dst += _clip.getX();
-#ifndef _WIN32_WCE
- *((uint32 *)dst) = *((uint32 *)(dst + offset));
-#else
+#if defined(SCUMM_NEED_ALIGNMENT)
memcpy(dst, dst + offset, sizeof(uint32));
+#else
+ *((uint32 *)dst) = *((uint32 *)(dst + offset));
#endif
dst += _clip.getX();
-#ifndef _WIN32_WCE
- *((uint32 *)dst) = *((uint32 *)(dst + offset));
-#else
+#if defined(SCUMM_NEED_ALIGNMENT)
memcpy(dst, dst + offset, sizeof(uint32));
+#else
+ *((uint32 *)dst) = *((uint32 *)(dst + offset));
#endif
#ifdef DEBUG_CLIPPER
} else {