diff options
author | Eugene Sandulenko | 2016-12-09 19:44:00 +0100 |
---|---|---|
committer | GitHub | 2016-12-09 19:44:00 +0100 |
commit | 774d55b7b6a52c30cdadee57441597a6542db70e (patch) | |
tree | ad2e4ae8b5df3fd5d35e441e6a87598aeaed4295 | |
parent | ffe52deeed75a2f5e393e2f478abd7a041bb7461 (diff) | |
parent | 3f71e2456ca5e1275ab5daa9e5578285b087c742 (diff) | |
download | scummvm-rg350-774d55b7b6a52c30cdadee57441597a6542db70e.tar.gz scummvm-rg350-774d55b7b6a52c30cdadee57441597a6542db70e.tar.bz2 scummvm-rg350-774d55b7b6a52c30cdadee57441597a6542db70e.zip |
Merge pull request #868 from danpla/cruise-fix-font
CRUISE: font: Don't overwrite transparent pixels
-rw-r--r-- | engines/cruise/font.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/cruise/font.cpp b/engines/cruise/font.cpp index 43fbf8c79b..335e0664bf 100644 --- a/engines/cruise/font.cpp +++ b/engines/cruise/font.cpp @@ -200,7 +200,9 @@ void renderWord(const uint8 *fontPtr_Data, uint8 *outBufferPtr, int xOffset, int fontPtr_Data2 += sizeof(uint16); for (int j = 0; j < charWidth; j++) { - *outBufferPtr = ((bitSet1 >> 15) & 1) | ((bitSet2 >> 14) & 2); + if (((bitSet1 >> 15) & 1)) { + *outBufferPtr = ((bitSet2 >> 15) & 1) + 1; + } outBufferPtr++; bitSet1 <<= 1; |