aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/pet_control
diff options
context:
space:
mode:
authorPaul Gilbert2016-11-30 21:40:10 -0500
committerPaul Gilbert2016-11-30 21:40:10 -0500
commit20832d79fb84b2f7fa7cd041b3006e1419c0916f (patch)
treea115e224bec9c8d75166500eedec6d10ae98d705 /engines/titanic/pet_control
parent51a208b00d884bca2145c65f39b4ac4974dee4a7 (diff)
downloadscummvm-rg350-20832d79fb84b2f7fa7cd041b3006e1419c0916f.tar.gz
scummvm-rg350-20832d79fb84b2f7fa7cd041b3006e1419c0916f.tar.bz2
scummvm-rg350-20832d79fb84b2f7fa7cd041b3006e1419c0916f.zip
TITANIC: Fix caseless string contains checks
Diffstat (limited to 'engines/titanic/pet_control')
-rw-r--r--engines/titanic/pet_control/pet_control.cpp4
-rw-r--r--engines/titanic/pet_control/pet_conversations.cpp18
2 files changed, 11 insertions, 11 deletions
diff --git a/engines/titanic/pet_control/pet_control.cpp b/engines/titanic/pet_control/pet_control.cpp
index 415d1e9821..423f87cd8c 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 c2cddd9598..8f317ed279 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 {