aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorEugene Sandulenko2009-12-31 10:49:16 +0000
committerEugene Sandulenko2009-12-31 10:49:16 +0000
commit70a1f7c89ad51579089fe2cd381ae9306a613bca (patch)
treee9505af0b66c7513f43a2ed64e0c03e62bd3b0a8 /engines/scumm
parent9f2b65888a1fffa4876f02e12371002fa931e563 (diff)
downloadscummvm-rg350-70a1f7c89ad51579089fe2cd381ae9306a613bca.tar.gz
scummvm-rg350-70a1f7c89ad51579089fe2cd381ae9306a613bca.tar.bz2
scummvm-rg350-70a1f7c89ad51579089fe2cd381ae9306a613bca.zip
Fix gcc warning
svn-id: r46796
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/charset.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp
index 8a1a27b333..a8f780ac49 100644
--- a/engines/scumm/charset.cpp
+++ b/engines/scumm/charset.cpp
@@ -313,7 +313,7 @@ byte *ScummEngine::get2byteCharPtr(int idx) {
memcpy(_2byteFontPtr, charsetPtr + 46, _2byteWidth * _2byteHeight * numChar / 8);
}
- idx = ((idx & 0x7F) << 8) | ((idx >> 8) & 0xFF) - 1;
+ idx = (SWAP_CONSTANT_16(idx) & 0x7fff) - 1;
} else {
idx = SJIStoFMTChunk((idx % 256), (idx / 256));
}