From 70a1f7c89ad51579089fe2cd381ae9306a613bca Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Thu, 31 Dec 2009 10:49:16 +0000
Subject: Fix gcc warning

svn-id: r46796
---
 engines/scumm/charset.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/scumm')

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));
 		}
-- 
cgit v1.2.3