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

[dreammaster]

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:
cbee771bad TITANIC: Fix remapping conversation log colors when changing class
e21b38df66 TITANIC: Fix getting 1st class suite from Deskbot


Commit: cbee771bad0bed004f01c36add9f0bdafb9b753c
    https://github.com/scummvm/scummvm/commit/cbee771bad0bed004f01c36add9f0bdafb9b753c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-16T20:46:52-05:00

Commit Message:
TITANIC: Fix remapping conversation log colors when changing class

Changed paths:
    engines/titanic/pet_control/pet_text.cpp


diff --git a/engines/titanic/pet_control/pet_text.cpp b/engines/titanic/pet_control/pet_text.cpp
index 7bb0bad..05038d2 100644
--- a/engines/titanic/pet_control/pet_text.cpp
+++ b/engines/titanic/pet_control/pet_text.cpp
@@ -249,20 +249,21 @@ void CPetText::setColor(byte r, byte g, byte b) {
 }
 
 void CPetText::remapColors(uint count, uint *srcColors, uint *destColors) {
-	if (_lineCount >= 0) {
-		for (int lineNum = 0; lineNum <= _lineCount; ++lineNum) {
-			// Get the rgb values
-			uint r = _array[lineNum]._rgb[1];
-			uint g = _array[lineNum]._rgb[2];
-			uint b = _array[lineNum]._rgb[3];
-			uint color = r | (g << 8) | (b << 16);
-
-			for (uint index = 0; index < count; ++index) {
-				if (color == srcColors[index]) {
-					// Found a match, so replace the color
-					setLineColor(lineNum, destColors[lineNum]);
-					break;
-				}
+	for (int lineNum = 0; lineNum <= _lineCount; ++lineNum) {
+		if (_array[lineNum]._rgb.empty())
+			continue;
+
+		// Get the rgb values
+		uint r = _array[lineNum]._rgb[1];
+		uint g = _array[lineNum]._rgb[2];
+		uint b = _array[lineNum]._rgb[3];
+		uint color = r | (g << 8) | (b << 16);
+
+		for (uint index = 0; index < count; ++index) {
+			if (color == srcColors[index]) {
+				// Found a match, so replace the color
+				setLineColor(lineNum, destColors[lineNum]);
+				break;
 			}
 		}
 	}


Commit: e21b38df666621ee057b6ba25f9756408693ccdc
    https://github.com/scummvm/scummvm/commit/e21b38df666621ee057b6ba25f9756408693ccdc
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-16T20:47:13-05:00

Commit Message:
TITANIC: Fix getting 1st class suite from Deskbot

Changed paths:
    engines/titanic/true_talk/tt_npc_script.cpp


diff --git a/engines/titanic/true_talk/tt_npc_script.cpp b/engines/titanic/true_talk/tt_npc_script.cpp
index 7540a73..2a5c155 100644
--- a/engines/titanic/true_talk/tt_npc_script.cpp
+++ b/engines/titanic/true_talk/tt_npc_script.cpp
@@ -707,7 +707,7 @@ int TTnpcScript::processEntries(const TTsentenceEntries *entries, uint entryCoun
 	for (uint loopCtr = 0; loopCtr < 2; ++loopCtr) {
 		for (uint entryCtr = 0; entryCtr < entryCount; ++entryCtr) {
 			const TTsentenceEntry &entry = (*entries)[entryCtr];
-			if (entry._category != categoryNum && (loopCtr == 0 || entry._category))
+			if (entry._category == categoryNum && (loopCtr == 0 || entry._category))
 				continue;
 
 			bool flag;