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

[dreammaster]

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

Summary:
77474f9020 TITANIC: Fix handling text input for LiftBot
68a8c82f69 TITANIC: Fix hang searching quotes tree
b0b9adcfda TITANIC: Use correct colors for text in the PET


Commit: 77474f90201b7500a6b0ce6456775ef5d038ae39
    https://github.com/scummvm/scummvm/commit/77474f90201b7500a6b0ce6456775ef5d038ae39
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-10T21:56:23-05:00

Commit Message:
TITANIC: Fix handling text input for LiftBot

Changed paths:
    engines/titanic/npcs/liftbot.cpp



diff --git a/engines/titanic/npcs/liftbot.cpp b/engines/titanic/npcs/liftbot.cpp
index 105c4aa..bb554a1 100644
--- a/engines/titanic/npcs/liftbot.cpp
+++ b/engines/titanic/npcs/liftbot.cpp
@@ -66,7 +66,7 @@ void CLiftBot::load(SimpleFile *file) {
 bool CLiftBot::TextInputMsg(CTextInputMsg *msg) {
 	CPetControl *pet = getPetControl();
 	if (_enabled || pet->getRoomsElevatorNum() != 4) {
-		if (getName() != "LiftBot") {
+		if (getName() == "LiftBot") {
 			CViewItem *view = findView();
 			processInput(msg, view);
 		}
@@ -108,7 +108,7 @@ bool CLiftBot::TrueTalkTriggerActionMsg(CTrueTalkTriggerActionMsg *msg) {
 }
 
 bool CLiftBot::LeaveRoomMsg(CLeaveRoomMsg *msg) {
-	if (getName() != "LiftBot")
+	if (getName() == "LiftBot")
 		performAction(false);
 
 	return true;


Commit: 68a8c82f69dc5a4e3b12b59cd1cd432e06d6a0ca
    https://github.com/scummvm/scummvm/commit/68a8c82f69dc5a4e3b12b59cd1cd432e06d6a0ca
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-10T21:58:07-05:00

Commit Message:
TITANIC: Fix hang searching quotes tree

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



diff --git a/engines/titanic/true_talk/tt_quotes_tree.cpp b/engines/titanic/true_talk/tt_quotes_tree.cpp
index 16453a1..e229388 100644
--- a/engines/titanic/true_talk/tt_quotes_tree.cpp
+++ b/engines/titanic/true_talk/tt_quotes_tree.cpp
@@ -66,7 +66,7 @@ int TTquotesTree::search(const char *str, QuoteTreeNum treeNum,
 		return -1;
 
 	if (remainder) {
-		while (*str) {
+		for (; *str; ++str) {
 			if (*str >= 'a' && *str != 's')
 				*remainder += *str;
 		}


Commit: b0b9adcfdae19b91b85af4330f415e54baa66b3a
    https://github.com/scummvm/scummvm/commit/b0b9adcfdae19b91b85af4330f415e54baa66b3a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-11T08:40:18-05:00

Commit Message:
TITANIC: Use correct colors for text in the PET

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 c7c6f49..a7b794e 100644
--- a/engines/titanic/pet_control/pet_text.cpp
+++ b/engines/titanic/pet_control/pet_text.cpp
@@ -57,7 +57,7 @@ void CPetText::setup() {
 }
 
 void CPetText::setLineColor(uint lineNum, uint col) {
-	setLineColor(lineNum, col & 0xff, (col >> 16) & 0xff, (col >> 8) & 0xff);
+	setLineColor(lineNum, col & 0xff, (col >> 8) & 0xff, (col >> 16) & 0xff);
 }
 
 void CPetText::setLineColor(uint lineNum, byte r, byte g, byte b) {