[Scummvm-git-logs] scummvm master -> f311aa38c1a264625209ba3a9c53d8477906b3fd

[dreammaster]

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:
f311aa38c1 TITANIC: Added CBaseStar draw2 method


Commit: f311aa38c1a264625209ba3a9c53d8477906b3fd
    https://github.com/scummvm/scummvm/commit/f311aa38c1a264625209ba3a9c53d8477906b3fd
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-03-26T18:14:26-04:00

Commit Message:
TITANIC: Added CBaseStar draw2 method

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 11885b7..8a78037 100644
--- a/engines/titanic/star_control/base_star.cpp
+++ b/engines/titanic/star_control/base_star.cpp
@@ -223,7 +223,7 @@ void CBaseStar::draw1(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStar
 		int r = (int)(red - 0.5) & 0xfff8;
 		int g = (int)(green - 0.5) & 0xfff8;
 		int b = (int)(blue - 0.5) & 0xfff8;
-		int rgb = (g | (r << 5)) << 2 | ((b >> 3) & 0xfff8);
+		int rgb = ((g | (r << 5)) << 2) | ((b >> 3) & 0xfff8);
 		uint16 *pixelP = (uint16 *)(surfaceArea->_pixelsPtr + surfaceArea->_pitch * yStart + xStart * 2);
 
 		switch (entry._thickness) {
@@ -306,10 +306,11 @@ void CBaseStar::draw2(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStar
 		if (skipCtr == 3)
 			continue;
 
-		int r = (int)(red - 0.5) & 0xfff8;
-		int g = (int)(green - 0.5) & 0xfff8;
+		int r = (int)(red - 0.5) & 0xf8;
+		int g = (int)(green - 0.5) & 0xfc;
 		int b = (int)(blue - 0.5) & 0xfff8;
-		int rgb = (g | (r << 5)) << 2 | ((b >> 3) & 0xfff8);
+
+		int rgb = ((g | (r << 5)) << 3) | (b >> 3);
 		uint16 *pixelP = (uint16 *)(surfaceArea->_pixelsPtr + surfaceArea->_pitch * yStart + xStart * 2);
 
 		switch (entry._thickness) {