aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Kagerer2010-10-04 17:03:38 +0000
committerFlorian Kagerer2010-10-04 17:03:38 +0000
commit3185b9df424593fa8159734cc0267c825fa3ff8b (patch)
tree688b9f1975ea8bd77e7b306a15a1126ebe07eedc
parent04a8ff06a21959f3048de5b0d09bbc45b5114f3c (diff)
downloadscummvm-rg350-3185b9df424593fa8159734cc0267c825fa3ff8b.tar.gz
scummvm-rg350-3185b9df424593fa8159734cc0267c825fa3ff8b.tar.bz2
scummvm-rg350-3185b9df424593fa8159734cc0267c825fa3ff8b.zip
SCUMM/FM-TOWNS: cleanup
svn-id: r53016
-rw-r--r--engines/scumm/gfx_towns.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/scumm/gfx_towns.cpp b/engines/scumm/gfx_towns.cpp
index 953ab98305..7198e103fc 100644
--- a/engines/scumm/gfx_towns.cpp
+++ b/engines/scumm/gfx_towns.cpp
@@ -53,7 +53,7 @@ void ScummEngine::towns_drawStripToScreen(VirtScreen *vs, int dstX, int dstY, in
for (int h = 0; h < height; ++h) {
if (_bytesPerPixelOutput == 2) {
for (int w = 0; w < width; ++w) {
- WRITE_UINT16(dst1, _16BitPalette[*src1++]);
+ *(uint16*)dst1 = _16BitPalette[*src1++];
dst1 += _bytesPerPixelOutput;
}
@@ -304,7 +304,7 @@ void TownsScreen::fillLayerRect(int layer, int x, int y, int w, int h, int col)
for (int i = 0; i < h; ++i) {
if (l->bpp == 2) {
for (int ii = 0; ii < w; ++ii) {
- WRITE_UINT16(pos, col);
+ *(uint16*)pos = col;
pos += 2;
}
pos += (l->pitch - w * 2);
@@ -471,10 +471,10 @@ void TownsScreen::updateOutputBuffer() {
if (col || l->onBottom) {
if (l->numCol == 16)
col = (col >> 4) & (col & 0x0f);
- WRITE_LE_UINT16(dst, l->bltTmpPal[col]);
+ *(uint16*)dst = l->bltTmpPal[col];
}
} else {
- WRITE_LE_UINT16(dst, READ_LE_UINT16(src));
+ *(uint16*)dst = *(uint16*)src;
}
dst += 2;
}