[Scummvm-git-logs] scummvm master -> 774d55b7b6a52c30cdadee57441597a6542db70e

sev- sev at scummvm.org
Fri Dec 9 19:44:03 CET 2016


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3f71e2456c CRUISE: font: Don't overwrite transparent pixels
774d55b7b6 Merge pull request #868 from danpla/cruise-fix-font


Commit: 3f71e2456ca5e1275ab5daa9e5578285b087c742
    https://github.com/scummvm/scummvm/commit/3f71e2456ca5e1275ab5daa9e5578285b087c742
Author: Daniel Plakhotich (daniel.plakhotich at gmail.com)
Date: 2016-12-09T19:59:19+02:00

Commit Message:
CRUISE: font: Don't overwrite transparent pixels

Changed paths:
    engines/cruise/font.cpp


diff --git a/engines/cruise/font.cpp b/engines/cruise/font.cpp
index 43fbf8c..335e066 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;


Commit: 774d55b7b6a52c30cdadee57441597a6542db70e
    https://github.com/scummvm/scummvm/commit/774d55b7b6a52c30cdadee57441597a6542db70e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-12-09T19:44:00+01:00

Commit Message:
Merge pull request #868 from danpla/cruise-fix-font

CRUISE: font: Don't overwrite transparent pixels

Changed paths:
    engines/cruise/font.cpp







More information about the Scummvm-git-logs mailing list