[Scummvm-git-logs] scummvm master -> 13f9ab01aa99464310d824defe0b6c14ea0244d4

dreammaster dreammaster at scummvm.org
Sun Apr 9 13:23:41 CEST 2017


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

Summary:
13f9ab01aa TITANIC: Fix  rendering of starfield pixels


Commit: 13f9ab01aa99464310d824defe0b6c14ea0244d4
    https://github.com/scummvm/scummvm/commit/13f9ab01aa99464310d824defe0b6c14ea0244d4
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-04-09T07:23:26-04:00

Commit Message:
TITANIC: Fix  rendering of starfield pixels

Changed paths:
    engines/titanic/star_control/base_star.cpp


diff --git a/engines/titanic/star_control/base_star.cpp b/engines/titanic/star_control/base_star.cpp
index cfadedd..c9ea3eb 100644
--- a/engines/titanic/star_control/base_star.cpp
+++ b/engines/titanic/star_control/base_star.cpp
@@ -419,14 +419,14 @@ void CBaseStar::draw3(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStar
 
 			switch (entry._thickness) {
 			case 0:
-				*pixelP = rgb;
+				*pixelP |= rgb;
 				break;
 
 			case 1:
-				*pixelP = rgb;
-				*(pixelP + 1) = rgb;
-				*(pixelP + surfaceArea->_pitch / 2) = rgb;
-				*(pixelP + surfaceArea->_pitch / 2 + 1) = rgb;
+				*pixelP |= rgb;
+				*(pixelP + 1) |= rgb;
+				*(pixelP + surfaceArea->_pitch / 2) |= rgb;
+				*(pixelP + surfaceArea->_pitch / 2 + 1) |= rgb;
 				break;
 
 			default:
@@ -526,14 +526,14 @@ void CBaseStar::draw4(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStar
 
 			switch (entry._thickness) {
 			case 0:
-				*pixelP = rgb;
+				*pixelP |= rgb;
 				break;
 
 			case 1:
-				*pixelP = rgb;
-				*(pixelP + 1) = rgb;
-				*(pixelP + surfaceArea->_pitch / 2) = rgb;
-				*(pixelP + surfaceArea->_pitch / 2 + 1) = rgb;
+				*pixelP |= rgb;
+				*(pixelP + 1) |= rgb;
+				*(pixelP + surfaceArea->_pitch / 2) |= rgb;
+				*(pixelP + surfaceArea->_pitch / 2 + 1) |= rgb;
 				break;
 
 			default:





More information about the Scummvm-git-logs mailing list