[Scummvm-cvs-logs] SF.net SVN: scummvm:[46796] scummvm/trunk/engines/scumm/charset.cpp

[sev at users.sourceforge.net]

Revision: 46796
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46796&view=rev
Author:   sev
Date:     2009-12-31 10:49:16 +0000 (Thu, 31 Dec 2009)

Log Message:
-----------
Fix gcc warning

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/charset.cpp

Modified: scummvm/trunk/engines/scumm/charset.cpp
===================================================================
--- scummvm/trunk/engines/scumm/charset.cpp	2009-12-31 10:13:59 UTC (rev 46795)
+++ scummvm/trunk/engines/scumm/charset.cpp	2009-12-31 10:49:16 UTC (rev 46796)
@@ -313,7 +313,7 @@
 				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));
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.