[Scummvm-git-logs] scummvm master -> 20832d79fb84b2f7fa7cd041b3006e1419c0916f

[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:
20832d79fb TITANIC: Fix caseless string contains checks


Commit: 20832d79fb84b2f7fa7cd041b3006e1419c0916f
    https://github.com/scummvm/scummvm/commit/20832d79fb84b2f7fa7cd041b3006e1419c0916f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-30T21:40:10-05:00

Commit Message:
TITANIC: Fix caseless string contains checks

Changed paths:
    engines/titanic/pet_control/pet_control.cpp
    engines/titanic/pet_control/pet_conversations.cpp
    engines/titanic/true_talk/bellbot_script.cpp


diff --git a/engines/titanic/pet_control/pet_control.cpp b/engines/titanic/pet_control/pet_control.cpp
index 415d1e9..423f87c 100644
--- a/engines/titanic/pet_control/pet_control.cpp
+++ b/engines/titanic/pet_control/pet_control.cpp
@@ -645,7 +645,7 @@ bool CPetControl::isDoorOrBellbotPresent() const {
 			treeItem = treeItem->scan(view)) {
 		CString name = treeItem->getName();
 		if (dynamic_cast<CGameObject *>(treeItem) &&
-				(name.contains("Doorbot") || name.contains("BellBot")))
+				(name.containsIgnoreCase("Doorbot") || name.containsIgnoreCase("BellBot")))
 			return true;
 	}
 
@@ -687,7 +687,7 @@ bool CPetControl::isSuccUBusActive() const {
 		return false;
 
 	CString name = getName();
-	return name.contains("Succubus") || name.contains("Sub");
+	return name.containsIgnoreCase("Succubus") || name.containsIgnoreCase("Sub");
 }
 
 void CPetControl::convResetDials(int flag) {
diff --git a/engines/titanic/pet_control/pet_conversations.cpp b/engines/titanic/pet_control/pet_conversations.cpp
index c2cddd9..8f317ed 100644
--- a/engines/titanic/pet_control/pet_conversations.cpp
+++ b/engines/titanic/pet_control/pet_conversations.cpp
@@ -286,30 +286,30 @@ void CPetConversations::displayNPCName(CGameObject *npc) {
 		CString name = npc->getName();
 		int id = 1;
 
-		if (name.contains("Doorbot")) {
+		if (name.containsIgnoreCase("Doorbot")) {
 			msg += strings[DOORBOT_NAME];
-		} else if (name.contains("Deskbot")) {
+		} else if (name.containsIgnoreCase("Deskbot")) {
 			id = 2;
 			msg += strings[DESKBOT_NAME];
-		} else if (name.contains("LiftBot")) {
+		} else if (name.containsIgnoreCase("LiftBot")) {
 			id = 3;
 			msg += strings[LIFTBOT_NAME];
-		} else if (name.contains("Parrot")) {
+		} else if (name.containsIgnoreCase("Parrot")) {
 			id = 4;
 			msg += strings[PARROT_NAME];
-		} else if (name.contains("BarBot")) {
+		} else if (name.containsIgnoreCase("BarBot")) {
 			id = 5;
 			msg += strings[BARBOT_NAME];
-		} else if (name.contains("ChatterBot")) {
+		} else if (name.containsIgnoreCase("ChatterBot")) {
 			id = 6;
 			msg += strings[CHATTERBOT_NAME];
-		} else if (name.contains("BellBot")) {
+		} else if (name.containsIgnoreCase("BellBot")) {
 			id = 7;
 			msg += strings[BELLBOT_NAME];
-		} else if (name.contains("Maitre")) {
+		} else if (name.containsIgnoreCase("Maitre")) {
 			id = 8;
 			msg += strings[MAITRED_NAME];
-		} else if (name.contains("Succubus") || name.contains("Sub")) {
+		} else if (name.containsIgnoreCase("Succubus") || name.containsIgnoreCase("Sub")) {
 			id = 9;
 			msg += strings[SUCCUBUS_NAME];
 		} else {
diff --git a/engines/titanic/true_talk/bellbot_script.cpp b/engines/titanic/true_talk/bellbot_script.cpp
index c51c918..44fa961 100644
--- a/engines/titanic/true_talk/bellbot_script.cpp
+++ b/engines/titanic/true_talk/bellbot_script.cpp
@@ -681,7 +681,8 @@ int BellbotScript::doSentenceEntry(int val1, const int *srcIdP, const TTroomScri
 			CNodeItem *node = CTrueTalkManager::_currentNPC->getNode();
 			if (node) {
 				CString nodeName = node->getName();
-				if (nodeName == "5" || nodeName == "6" || nodeName == "7") {
+				if (nodeName.containsIgnoreCase("5") || nodeName.containsIgnoreCase("6")
+						|| nodeName.containsIgnoreCase("7")) {
 					CTrueTalkManager::triggerAction(29, 2);
 					selectResponse(201571);
 					applyResponse();
@@ -707,7 +708,8 @@ int BellbotScript::doSentenceEntry(int val1, const int *srcIdP, const TTroomScri
 			CNodeItem *node = CTrueTalkManager::_currentNPC->getNode();
 			if (node) {
 				CString nodeName = node->getName();
-				if (nodeName == "5" || nodeName == "6" || nodeName != "7") {
+				if (nodeName.containsIgnoreCase("5") || nodeName.containsIgnoreCase("6")
+						|| nodeName.containsIgnoreCase("7")) {
 					CTrueTalkManager::triggerAction(29, 2);
 					selectResponse(201571);
 					applyResponse();