aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/titanic/true_talk/barbot_script.cpp4
-rw-r--r--engines/titanic/true_talk/bellbot_script.cpp130
-rw-r--r--engines/titanic/true_talk/deskbot_script.cpp46
-rw-r--r--engines/titanic/true_talk/doorbot_script.cpp6
-rw-r--r--engines/titanic/true_talk/liftbot_script.cpp4
-rw-r--r--engines/titanic/true_talk/maitred_script.cpp22
-rw-r--r--engines/titanic/true_talk/parrot_script.cpp2
-rw-r--r--engines/titanic/true_talk/script_support.cpp2
-rw-r--r--engines/titanic/true_talk/script_support.h4
-rw-r--r--engines/titanic/true_talk/succubus_script.cpp2
-rw-r--r--engines/titanic/true_talk/tt_npc_script.cpp6
-rw-r--r--engines/titanic/true_talk/tt_parser.cpp102
-rw-r--r--engines/titanic/true_talk/tt_sentence.cpp4
-rw-r--r--engines/titanic/true_talk/tt_sentence.h4
14 files changed, 169 insertions, 169 deletions
diff --git a/engines/titanic/true_talk/barbot_script.cpp b/engines/titanic/true_talk/barbot_script.cpp
index 76f28540ea..ad10f5a57f 100644
--- a/engines/titanic/true_talk/barbot_script.cpp
+++ b/engines/titanic/true_talk/barbot_script.cpp
@@ -167,7 +167,7 @@ int BarbotScript::process(const TTroomScript *roomScript, const TTsentence *sent
dialogueId = ARRAY2[0];
_arrIndex = 1;
} else if (getRandomNumber(100) > 60) {
- switch (sentence->_field2C) {
+ switch (sentence->_category) {
case 2:
dialogueId = 51914;
break;
@@ -209,7 +209,7 @@ int BarbotScript::process(const TTroomScript *roomScript, const TTsentence *sent
int val34 = getState();
setState(0);
- int val2C = sentence->_field2C;
+ int val2C = sentence->_category;
bool flag = val2C == 11 || val2C == 13;
bool flag2 = val2C == 12;
diff --git a/engines/titanic/true_talk/bellbot_script.cpp b/engines/titanic/true_talk/bellbot_script.cpp
index 9f9b6fa267..c51c918a2e 100644
--- a/engines/titanic/true_talk/bellbot_script.cpp
+++ b/engines/titanic/true_talk/bellbot_script.cpp
@@ -239,11 +239,11 @@ int BellbotScript::process(const TTroomScript *roomScript, const TTsentence *sen
if (processEntries(&_entries, _entryCount, roomScript, sentence) == 2)
return 2;
- if ((sentence->_field2C == 4 && sentence->localWord("am") && sentence->localWord("i"))
+ if ((sentence->_category == 4 && sentence->localWord("am") && sentence->localWord("i"))
|| (sentence->localWord("are") && sentence->localWord("we"))
- || (sentence->_field2C == 3 && sentence->localWord("room")
+ || (sentence->_category == 3 && sentence->localWord("room")
&& sentence->localWord("we") && sentence->localWord("in"))
- || (sentence->_field2C == 3 && sentence->localWord("rom")
+ || (sentence->_category == 3 && sentence->localWord("rom")
&& sentence->localWord("is") && sentence->localWord("this"))
) {
uint id = getRangeValue(getRoomDialogueId(roomScript));
@@ -795,22 +795,22 @@ int BellbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
bool applyFlag = false, stateFlag = true;
switch (getValue(23)) {
case 1:
- if (sentence->_field2C == 11 || sentence->_field2C == 13) {
+ if (sentence->_category == 11 || sentence->_category == 13) {
addResponse(getDialogueId(200818));
applyFlag = true;
}
- if (sentence->_field2C == 12) {
+ if (sentence->_category == 12) {
addResponse(getDialogueId(200817));
applyFlag = true;
}
break;
case 2:
- if (sentence->_field2C == 11 || sentence->_field2C == 13) {
+ if (sentence->_category == 11 || sentence->_category == 13) {
addResponse(getDialogueId(200835));
addResponse(getDialogueId(200830));
applyFlag = true;
- } else if (sentence->_field2C == 12) {
+ } else if (sentence->_category == 12) {
addResponse(getDialogueId(200834));
addResponse(getDialogueId(200830));
applyFlag = true;
@@ -818,7 +818,7 @@ int BellbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
break;
case 3:
- if (sentence->_field2C >= 11 && sentence->_field2C <= 13) {
+ if (sentence->_category >= 11 && sentence->_category <= 13) {
addResponse(getDialogueId(200831));
addResponse(getDialogueId(200833));
applyFlag = true;
@@ -826,36 +826,36 @@ int BellbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
break;
case 4:
- if (sentence->_field2C == 11) {
+ if (sentence->_category == 11) {
addResponse(getDialogueId(200872));
applyFlag = true;
}
- if (sentence->_field2C == 12 || sentence->_field2C == 13) {
+ if (sentence->_category == 12 || sentence->_category == 13) {
addResponse(getDialogueId(200873));
applyFlag = true;
}
break;
case 5:
- if (sentence->_field2C == 11 || sentence->_field2C == 13) {
+ if (sentence->_category == 11 || sentence->_category == 13) {
addResponse(getDialogueId(200492));
applyFlag = true;
}
- if (sentence->_field2C == 12) {
+ if (sentence->_category == 12) {
addResponse(getDialogueId(200491));
applyFlag = true;
}
break;
case 6:
- if (sentence->_field2C == 11 || sentence->_field2C == 13) {
+ if (sentence->_category == 11 || sentence->_category == 13) {
addResponse(getDialogueId(200496));
applyResponse();
setState(0);
CTrueTalkManager::setFlags(23, 7);
return 2;
}
- if (sentence->_field2C == 12) {
+ if (sentence->_category == 12) {
addResponse(getDialogueId(200127));
applyFlag = true;
}
@@ -880,7 +880,7 @@ int BellbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
break;
case 10:
- if (sentence->_field2C == 11 || sentence->_field2C == 13) {
+ if (sentence->_category == 11 || sentence->_category == 13) {
addResponse(getDialogueId(200317));
applyResponse();
setState(0);
@@ -888,14 +888,14 @@ int BellbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
return 2;
}
- addResponse(getDialogueId(sentence->_field2C == 12 ? 200316 : 200315));
+ addResponse(getDialogueId(sentence->_category == 12 ? 200316 : 200315));
applyFlag = true;
break;
case 11:
- if (sentence->_field2C == 11 || sentence->_field2C == 13) {
+ if (sentence->_category == 11 || sentence->_category == 13) {
addResponse(getDialogueId(200055));
- } else if (sentence->_field2C == 12) {
+ } else if (sentence->_category == 12) {
addResponse(getDialogueId(200318));
} else {
addResponse(getDialogueId(200315));
@@ -905,30 +905,30 @@ int BellbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
break;
case 12:
- if (sentence->_field2C == 6) {
+ if (sentence->_category == 6) {
addResponse(getDialogueId(200259));
applyFlag = true;
}
break;
case 13:
- if (sentence->_field2C == 11 || sentence->_field2C == 13) {
+ if (sentence->_category == 11 || sentence->_category == 13) {
addResponse(getDialogueId(200207));
applyFlag = true;
- } else if (sentence->_field2C == 12) {
+ } else if (sentence->_category == 12) {
addResponse(getDialogueId(200206));
applyFlag = true;
}
break;
case 14:
- if (sentence->_field2C == 6) {
+ if (sentence->_category == 6) {
addResponse(getDialogueId(200349));
applyFlag = true;
}
case 15:
- if (sentence->_field2C == 6) {
+ if (sentence->_category == 6) {
addResponse(getDialogueId(200130));
applyResponse();
setState(0);
@@ -945,7 +945,7 @@ int BellbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
break;
case 17:
- if ((sentence->_field2C == 3 && sentence->localWord("code"))
+ if ((sentence->_category == 3 && sentence->localWord("code"))
|| (sentence->localWord("which") && sentence->localWord("is"))
|| sentence->localWord("remember")
|| sentence->localWord("know")
@@ -957,7 +957,7 @@ int BellbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
break;
case 19:
- if (sentence->_field2C == 11 || sentence->_field2C == 13) {
+ if (sentence->_category == 11 || sentence->_category == 13) {
addResponse(getDialogueId(200223));
applyFlag = true;
}
@@ -1042,12 +1042,12 @@ int BellbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
break;
case 31:
- addResponse(getDialogueId(sentence->_field2C == 11 ? 200810 : 200811));
+ addResponse(getDialogueId(sentence->_category == 11 ? 200810 : 200811));
applyFlag = true;
break;
case 32:
- addResponse(getDialogueId(sentence->_field2C == 11 ? 200810 : 200812));
+ addResponse(getDialogueId(sentence->_category == 11 ? 200810 : 200812));
applyFlag = true;
break;
@@ -1062,7 +1062,7 @@ int BellbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
break;
case 35:
- if (sentence->_field2C == 3 && sentence->localWord("it")
+ if (sentence->_category == 3 && sentence->localWord("it")
&& (sentence->localWord("for") || sentence->localWord("do"))) {
addResponse(getDialogueId(200768));
applyFlag = true;
@@ -1070,7 +1070,7 @@ int BellbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
break;
case 36:
- if (sentence->_field2C == 11) {
+ if (sentence->_category == 11) {
CTrueTalkManager::triggerAction(14, 0);
addResponse(getDialogueId(200761));
applyFlag = true;
@@ -1083,14 +1083,14 @@ int BellbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
break;
case 38:
- if (sentence->_field2C == 12) {
+ if (sentence->_category == 12) {
addResponse(getDialogueId(200631));
applyFlag = true;
}
break;
case 39:
- if (sentence->_field2C == 11 || sentence->_field2C == 13) {
+ if (sentence->_category == 11 || sentence->_category == 13) {
addResponse(getDialogueId(200632));
stateFlag = false;
} else {
@@ -1124,7 +1124,7 @@ int BellbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
break;
case 43:
- if (sentence->_field2C == 11 || sentence->_field2C == 13) {
+ if (sentence->_category == 11 || sentence->_category == 13) {
addResponse(getDialogueId(200643));
applyFlag = true;
}
@@ -1157,7 +1157,7 @@ case44:
goto case44;
case 47:
- if (sentence->_field2C == 12)
+ if (sentence->_category == 12)
addResponse(getDialogueId(200368));
addResponse(getDialogueId(200366));
applyFlag = true;
@@ -1177,7 +1177,7 @@ case44:
break;
case 49:
- if (sentence->_field2C >= 11 && sentence->_field2C <= 13) {
+ if (sentence->_category >= 11 && sentence->_category <= 13) {
addResponse(getDialogueId(200407));
applyFlag = true;
stateFlag = false;
@@ -1185,7 +1185,7 @@ case44:
break;
case 50:
- if (sentence->_field2C == 11 || sentence->_field2C == 13) {
+ if (sentence->_category == 11 || sentence->_category == 13) {
addResponse(getDialogueId(200408));
stateFlag = false;
} else {
@@ -1204,24 +1204,24 @@ case44:
break;
case 52:
- if (sentence->_field2C >= 11 && sentence->_field2C <= 13) {
+ if (sentence->_category >= 11 && sentence->_category <= 13) {
addResponse(getDialogueId(200872));
applyFlag = true;
}
break;
case 53:
- if (sentence->_field2C == 12) {
+ if (sentence->_category == 12) {
addResponse(getDialogueId(200525));
applyFlag = true;
- } else if (sentence->_field2C == 11 || sentence->_field2C == 13) {
+ } else if (sentence->_category == 11 || sentence->_category == 13) {
addResponse(getDialogueId(200526));
applyFlag = true;
}
break;
case 54:
- if (sentence->_field2C == 12) {
+ if (sentence->_category == 12) {
addResponse(getDialogueId(200095));
applyFlag = true;
stateFlag = false;
@@ -1229,7 +1229,7 @@ case44:
break;
case 55:
- if (sentence->_field2C == 6) {
+ if (sentence->_category == 6) {
addResponse(getDialogueId(200112));
applyFlag = true;
}
@@ -1258,7 +1258,7 @@ case44:
case 58:
if (sentence->localWord("more")
|| (sentence->localWord("go") && sentence->localWord("on"))
- || (sentence->_field2C == 11 && sentence->localWord("really"))) {
+ || (sentence->_category == 11 && sentence->localWord("really"))) {
addResponse(getDialogueId(200650));
applyFlag = true;
stateFlag = false;
@@ -1274,7 +1274,7 @@ case44:
break;
case 60:
- if (sentence->_field2C == 3 && sentence->localWord("they") && sentence->localWord("do")) {
+ if (sentence->_category == 3 && sentence->localWord("they") && sentence->localWord("do")) {
addResponse(getDialogueId(200652));
applyFlag = true;
stateFlag = false;
@@ -1351,7 +1351,7 @@ stateFlag = false;
break;
case 70:
- if (sentence->_field2C == 12) {
+ if (sentence->_category == 12) {
addResponse(getDialogueId(201012));
applyFlag = true;
stateFlag = false;
@@ -1366,10 +1366,10 @@ stateFlag = false;
break;
case 72:
- if (sentence->_field2C == 12) {
+ if (sentence->_category == 12) {
addResponse(getDialogueId(200921));
applyFlag = true;
- } else if (sentence->_field2C == 11 || sentence->_field2C == 13) {
+ } else if (sentence->_category == 11 || sentence->_category == 13) {
addResponse(getDialogueId(200920));
applyFlag = true;
}
@@ -1384,7 +1384,7 @@ stateFlag = false;
break;
case 74:
- if (sentence->_field2C == 6) {
+ if (sentence->_category == 6) {
addResponse(getDialogueId(201022));
applyFlag = true;
stateFlag = false;
@@ -1392,7 +1392,7 @@ stateFlag = false;
break;
case 75:
- if (sentence->_field2C == 3) {
+ if (sentence->_category == 3) {
if (sentence->localWord("that") || sentence->localWord("worb")) {
addResponse(getDialogueId(201802));
applyFlag = true;
@@ -1401,7 +1401,7 @@ stateFlag = false;
break;
case 76:
- if (sentence->_field2C == 2 && (sentence->localWord("that") || sentence->localWord("gat"))) {
+ if (sentence->_category == 2 && (sentence->localWord("that") || sentence->localWord("gat"))) {
addResponse(getDialogueId(201034));
applyFlag = true;
stateFlag = false;
@@ -1409,7 +1409,7 @@ stateFlag = false;
break;
case 77:
- if (sentence->_field2C == 4 || sentence->_field2C == 3) {
+ if (sentence->_category == 4 || sentence->_category == 3) {
if (sentence->localWord("that") || sentence->localWord("blerontis")) {
addResponse(getDialogueId(201035));
applyFlag = true;
@@ -1418,11 +1418,11 @@ stateFlag = false;
break;
case 78:
- if (sentence->_field2C == 12) {
+ if (sentence->_category == 12) {
addResponse(getDialogueId(201034));
applyFlag = true;
stateFlag = false;
- } else if (sentence->_field2C == 11) {
+ } else if (sentence->_category == 11) {
addResponse(getDialogueId(201040));
applyFlag = true;
} else if ((sentence->localWord("not") && sentence->localWord("remember"))
@@ -1438,12 +1438,12 @@ stateFlag = false;
break;
case 79:
- if (sentence->_field2C == 11 || sentence->_field2C == 13) {
+ if (sentence->_category == 11 || sentence->_category == 13) {
addResponse(getDialogueId(201052));
CTrueTalkManager::triggerAction(14, 0);
applyFlag = true;
stateFlag = false;
- } else if (sentence->_field2C == 12) {
+ } else if (sentence->_category == 12) {
addResponse(getDialogueId(202119));
addResponse(getDialogueId(200256));
applyFlag = true;
@@ -1454,7 +1454,7 @@ stateFlag = false;
if ((!sentence->localWord("what") && sentence->localWord("how"))
|| sentence->localWord("about")
|| sentence->localWord("you")) {
- if (sentence->_field2C != 3 && sentence->_field2C != 4 && sentence->_field2C != 7) {
+ if (sentence->_category != 3 && sentence->_category != 4 && sentence->_category != 7) {
addResponse(getDialogueId(201694));
applyFlag = true;
stateFlag = false;
@@ -1477,7 +1477,7 @@ stateFlag = false;
break;
case 82:
- if ((sentence->_field2C == 3 && sentence->localWord("mean"))
+ if ((sentence->_category == 3 && sentence->localWord("mean"))
|| sentence->localWord("surf")
|| (sentence->localWord("what") && sentence->localWord("talk")
&& sentence->localWord("about"))) {
@@ -1488,14 +1488,14 @@ stateFlag = false;
break;
case 83:
- if (sentence->_field2C != 3 && sentence->_field2C != 4 && sentence->_field2C != 7) {
+ if (sentence->_category != 3 && sentence->_category != 4 && sentence->_category != 7) {
addResponse(getDialogueId(201083));
applyFlag = true;
}
break;
case 84:
- if (sentence->_field2C == 12) {
+ if (sentence->_category == 12) {
addResponse(getDialogueId(202119));
switch (getValue(1)) {
@@ -1511,7 +1511,7 @@ stateFlag = false;
default:
break;
}
- } else if (sentence->_field2C == 11) {
+ } else if (sentence->_category == 11) {
addResponse(getDialogueId(201060));
addResponse(getDialogueId(201079));
applyFlag = true;
@@ -1520,22 +1520,22 @@ stateFlag = false;
break;
case 85:
- if (sentence->_field2C == 11 || sentence->_field2C == 13) {
+ if (sentence->_category == 11 || sentence->_category == 13) {
addResponse(getDialogueId(201814));
applyFlag = true;
}
- if (sentence->_field2C == 12) {
+ if (sentence->_category == 12) {
addResponse(getDialogueId(201813));
applyFlag = true;
}
break;
case 86:
- if (sentence->_field2C == 11 || sentence->_field2C == 13) {
+ if (sentence->_category == 11 || sentence->_category == 13) {
addResponse(getDialogueId(202109));
applyFlag = true;
}
- if (sentence->_field2C == 12) {
+ if (sentence->_category == 12) {
addResponse(getDialogueId(202108));
applyFlag = true;
}
@@ -1548,14 +1548,14 @@ stateFlag = false;
break;
case 88:
- if (sentence->_field2C == 6 || sentence->contains("upside down")) {
+ if (sentence->_category == 6 || sentence->contains("upside down")) {
addResponse(getDialogueId(202142));
applyFlag = true;
}
break;
case 89:
- if (sentence->_field2C == 2) {
+ if (sentence->_category == 2) {
addResponse(getDialogueId(200739));
applyFlag = true;
stateFlag = false;
@@ -1710,7 +1710,7 @@ bool BellbotScript::checkCommonWords(const TTroomScript *roomScript, const TTsen
if (!roomScript || !sentence)
return 0;
CTrueTalkManager::setFlags(23, 0);
- if (sentence->_field2C != 4)
+ if (sentence->_category != 4)
return 0;
if (sentence->localWord("garage")) {
diff --git a/engines/titanic/true_talk/deskbot_script.cpp b/engines/titanic/true_talk/deskbot_script.cpp
index 6f8a760bc9..d38d53a296 100644
--- a/engines/titanic/true_talk/deskbot_script.cpp
+++ b/engines/titanic/true_talk/deskbot_script.cpp
@@ -540,9 +540,9 @@ int DeskbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
bool stateFlag = true, applyFlag = false;
switch (getValue(CURRENT_STATE)) {
case 1:
- if (sentence->_field2C != 3 && sentence->_field2C != 4
- && sentence->_field2C != 6 && sentence->_field2C != 10
- && sentence->_field2C != 2) {
+ if (sentence->_category != 3 && sentence->_category != 4
+ && sentence->_category != 6 && sentence->_category != 10
+ && sentence->_category != 2) {
addResponse(getDialogueId(240423));
applyFlag = true;
}
@@ -556,15 +556,15 @@ int DeskbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
break;
case 3:
- if (sentence->_field2C == 11 || sentence->_field2C == 13
- || sentence->_field2C == 3 || sentence->localWord("upgrade")) {
+ if (sentence->_category == 11 || sentence->_category == 13
+ || sentence->_category == 3 || sentence->localWord("upgrade")) {
addResponse(getDialogueId(240433));
applyFlag = true;
}
break;
case 4:
- addResponse(getDialogueId(sentence->_field2C == 11 || sentence->_field2C == 13
+ addResponse(getDialogueId(sentence->_category == 11 || sentence->_category == 13
? 240495 : 240494));
applyFlag = true;
break;
@@ -596,7 +596,7 @@ int DeskbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
stateFlag = true;
} else if (sentence->localWord("name")
|| sentence->localWord("called")
- || sentence->_field2C == 11) {
+ || sentence->_category == 11) {
addResponse(getDialogueId(240448));
stateFlag = true;
} else {
@@ -607,7 +607,7 @@ int DeskbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
break;
case 7:
- if (sentence->_field2C == 11 || sentence->_field2C == 13
+ if (sentence->_category == 11 || sentence->_category == 13
|| (sentence->localWord("what") && sentence->localWord("wrong"))
|| sentence->localWord("clothes")) {
addResponse(getDialogueId(240489));
@@ -618,7 +618,7 @@ int DeskbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
case 8:
if (isDial1Low() && getValue(1) == 4) {
- if (sentence->_field2C == 12 || sentence->_field2C == 13
+ if (sentence->_category == 12 || sentence->_category == 13
|| sentence->contains("do not")) {
addResponse(getDialogueId(240447));
@@ -628,7 +628,7 @@ int DeskbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
CTrueTalkManager::triggerAction(19, 3);
CTrueTalkManager::setFlags(22, 1);
applyFlag = true;
- } else if (sentence->_field2C == 11) {
+ } else if (sentence->_category == 11) {
addResponse(getDialogueId(240746));
applyFlag = true;
stateFlag = false;
@@ -1091,7 +1091,7 @@ int DeskbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
case 74:
case 75:
- if (sentence->_field2C == 24) {
+ if (sentence->_category == 24) {
addResponse(getDialogueId(240972));
applyFlag = true;
} else if (sentence->localWord("good") || sentence->localWord("yes")
@@ -1103,7 +1103,7 @@ int DeskbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
break;
case 76:
- if (sentence->_field2C == 6) {
+ if (sentence->_category == 6) {
addResponse(getDialogueId(240767));
applyFlag = true;
stateFlag = false;
@@ -1111,7 +1111,7 @@ int DeskbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
break;
case 77:
- if (sentence->_field2C == 3) {
+ if (sentence->_category == 3) {
addResponse(getDialogueId(241109));
applyFlag = true;
stateFlag = false;
@@ -1119,10 +1119,10 @@ int DeskbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
case 78:
// "Do you have a reservation?"
- if (sentence->_field2C == 11 || sentence->_field2C == 13) {
+ if (sentence->_category == 11 || sentence->_category == 13) {
// Player said they have a reservation
addResponse(getDialogueId(241262));
- } else if (sentence->_field2C == 12 || sentence->contains("do not")) {
+ } else if (sentence->_category == 12 || sentence->contains("do not")) {
// Player said they don't have a reservation
setDialRegion(0, 0);
setDialRegion(1, 0);
@@ -1161,14 +1161,14 @@ int DeskbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
break;
case 81:
- addResponse(getDialogueId(sentence->_field2C == 12 ? 240602 : 241337));
+ addResponse(getDialogueId(sentence->_category == 12 ? 240602 : 241337));
applyResponse();
setState(0);
CTrueTalkManager::setFlags(CURRENT_STATE, 0);
return 2;
case 82:
- if (sentence->_field2C == 2) {
+ if (sentence->_category == 2) {
addResponse(getDialogueId(241339));
applyFlag = true;
}
@@ -1187,7 +1187,7 @@ int DeskbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
break;
case 84:
- if (sentence->_field2C == 12 || sentence->contains("vegetarian")
+ if (sentence->_category == 12 || sentence->contains("vegetarian")
|| sentence->contains("vegitarian")) {
addResponse(getDialogueId(241718));
addResponse(getDialogueId(241709));
@@ -1214,7 +1214,7 @@ int DeskbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
break;
case 85:
- if (sentence->_field2C == 12 || sentence->contains("bugle")
+ if (sentence->_category == 12 || sentence->contains("bugle")
|| sentence->contains("buggle") || sentence->contains("trumpet")
|| sentence->contains("saxophone") || sentence->contains("kazoo")
|| sentence->contains("blerontin 1") || sentence->contains("the 1")
@@ -1235,7 +1235,7 @@ int DeskbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
break;
case 86:
- if (sentence->_field2C == 12 || sentence->_field2C == 11 || sentence->contains("view")) {
+ if (sentence->_category == 12 || sentence->_category == 11 || sentence->contains("view")) {
addResponse(getDialogueId(241714));
addResponse(getDialogueId(241699));
} else {
@@ -1359,11 +1359,11 @@ int DeskbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
case 92:
case 93:
// "Fish?"
- if (sentence->_field2C == 11 || sentence->_field2C == 13) {
+ if (sentence->_category == 11 || sentence->_category == 13) {
// Yes
addResponse(getDialogueId(241077));
addResponse(getDialogueId(241706));
- } else if (sentence->_field2C == 12) {
+ } else if (sentence->_category == 12) {
// No
addAssignedRoom();
setState(0);
@@ -1422,7 +1422,7 @@ int DeskbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
break;
case 96:
- if (sentence->_field2C == 2) {
+ if (sentence->_category == 2) {
addResponse(getDialogueId(241350));
applyFlag = true;
stateFlag = false;
diff --git a/engines/titanic/true_talk/doorbot_script.cpp b/engines/titanic/true_talk/doorbot_script.cpp
index 5c7403f187..b1d6a91107 100644
--- a/engines/titanic/true_talk/doorbot_script.cpp
+++ b/engines/titanic/true_talk/doorbot_script.cpp
@@ -196,13 +196,13 @@ int DoorbotScript::process(const TTroomScript *roomScript, const TTsentence *sen
return setResponse(getDialogueId(220113));
}
- if (sentence->_field2C == 6 && sentence->contains("why not")) {
+ if (sentence->_category == 6 && sentence->contains("why not")) {
return setResponse(11871, 8);
}
currState = getState();
if (currState) {
- int sentMode = sentence->_field2C;
+ int sentMode = sentence->_category;
bool flag1 = sentMode == 11 || sentMode == 13;
bool flag2 = sentMode == 12;
@@ -475,7 +475,7 @@ int DoorbotScript::process(const TTroomScript *roomScript, const TTsentence *sen
|| defaultProcess(roomScript, sentence))
return 2;
- switch (sentence->_field2C) {
+ switch (sentence->_category) {
case 11:
if (getRandomNumber(100) > 90)
return setResponse(10839, 42);
diff --git a/engines/titanic/true_talk/liftbot_script.cpp b/engines/titanic/true_talk/liftbot_script.cpp
index 4b253ca9af..e52e47d99d 100644
--- a/engines/titanic/true_talk/liftbot_script.cpp
+++ b/engines/titanic/true_talk/liftbot_script.cpp
@@ -92,7 +92,7 @@ int LiftbotScript::process(const TTroomScript *roomScript, const TTsentence *sen
checkItems(roomScript, sentence);
int currState = getState();
- int sentMode = sentence->_field2C;
+ int sentMode = sentence->_category;
TTtreeResult treeResult;
if (currState) {
@@ -651,7 +651,7 @@ int LiftbotScript::sentence1(const TTsentence *sentence) {
return 1;
}
- if (sentence->_field2C == 4 || sentence->localWord("find")
+ if (sentence->_category == 4 || sentence->localWord("find")
|| sentence->contains("get to")) {
if (getCurrentFloor() != diff) {
selectResponse(diff == 1 ? 210769 : 210764);
diff --git a/engines/titanic/true_talk/maitred_script.cpp b/engines/titanic/true_talk/maitred_script.cpp
index e902169ed0..cb1a3a5460 100644
--- a/engines/titanic/true_talk/maitred_script.cpp
+++ b/engines/titanic/true_talk/maitred_script.cpp
@@ -726,7 +726,7 @@ int MaitreDScript::preprocess(const TTroomScript *roomScript, const TTsentence *
break;
case 7:
- if (sentence->_field2C == 12) {
+ if (sentence->_category == 12) {
addResponse(getDialogueId(260089));
applyFlag = true;
stateFlag = false;
@@ -738,7 +738,7 @@ int MaitreDScript::preprocess(const TTroomScript *roomScript, const TTsentence *
break;
case 8:
- if (sentence->_field2C == 11 || sentence->_field2C == 13) {
+ if (sentence->_category == 11 || sentence->_category == 13) {
trigger12(false);
addResponse(getDialogueId(260094));
CTrueTalkManager::setFlags(11, 1);
@@ -819,7 +819,7 @@ int MaitreDScript::preprocess(const TTroomScript *roomScript, const TTsentence *
break;
case 16:
- addResponse(getDialogueId(sentence->_field2C == 11 ? 260209 : 260210));
+ addResponse(getDialogueId(sentence->_category == 11 ? 260209 : 260210));
applyFlag = true;
stateFlag = false;
break;
@@ -843,13 +843,13 @@ int MaitreDScript::preprocess(const TTroomScript *roomScript, const TTsentence *
break;
case 18:
- if (sentence->_field2C == 11) {
+ if (sentence->_category == 11) {
addResponse(getDialogueId(260232));
applyFlag = true;
- } else if (sentence->_field2C == 12) {
+ } else if (sentence->_category == 12) {
addResponse(getDialogueId(260231));
applyFlag = true;
- } else if (sentence->_field2C == 13) {
+ } else if (sentence->_category == 13) {
addResponse(getDialogueId(260444));
addResponse(getDialogueId(260233));
applyFlag = true;
@@ -937,7 +937,7 @@ int MaitreDScript::preprocess(const TTroomScript *roomScript, const TTsentence *
break;
case 23:
- if (sentence->_field2C == 11) {
+ if (sentence->_category == 11) {
addResponse(getDialogueId(260237));
applyFlag = true;
stateFlag = false;
@@ -992,7 +992,7 @@ int MaitreDScript::preprocess(const TTroomScript *roomScript, const TTsentence *
addResponse(getDialogueId(260256));
applyFlag = true;
stateFlag = false;
- } else if (sentence->_field2C == 12) {
+ } else if (sentence->_category == 12) {
addResponse(getDialogueId(260255));
applyFlag = true;
stateFlag = false;
@@ -1024,7 +1024,7 @@ int MaitreDScript::preprocess(const TTroomScript *roomScript, const TTsentence *
break;
case 29:
- if (sentence->_field2C == 11) {
+ if (sentence->_category == 11) {
setFlags12();
addResponse(getDialogueId(260131));
} else {
@@ -1034,10 +1034,10 @@ int MaitreDScript::preprocess(const TTroomScript *roomScript, const TTsentence *
break;
case 30:
- if (sentence->_field2C == 11 || sentence->_field2C == 13) {
+ if (sentence->_category == 11 || sentence->_category == 13) {
addResponse(getDialogueId(260695));
applyFlag = true;
- } else if (sentence->_field2C == 12) {
+ } else if (sentence->_category == 12) {
addResponse(getDialogueId(260696));
applyFlag = true;
}
diff --git a/engines/titanic/true_talk/parrot_script.cpp b/engines/titanic/true_talk/parrot_script.cpp
index b09e74505c..25b54f0715 100644
--- a/engines/titanic/true_talk/parrot_script.cpp
+++ b/engines/titanic/true_talk/parrot_script.cpp
@@ -55,7 +55,7 @@ int ParrotScript::process(const TTroomScript *roomScript, const TTsentence *sent
if (processEntries(roomScript, sentence) == 2) {
int tagId = g_vm->_trueTalkManager->_quotes.find(sentence->_normalizedLine);
if (!tagId || chooseResponse(roomScript, sentence, tagId) != 2) {
- addResponse(getDialogueId(sentence->check2C() ? 280248 : 280235));
+ addResponse(getDialogueId(sentence->checkCategory() ? 280248 : 280235));
applyResponse();
}
}
diff --git a/engines/titanic/true_talk/script_support.cpp b/engines/titanic/true_talk/script_support.cpp
index 440cb1ab98..52676139f0 100644
--- a/engines/titanic/true_talk/script_support.cpp
+++ b/engines/titanic/true_talk/script_support.cpp
@@ -57,7 +57,7 @@ bool TTsentenceEntry::load(Common::SeekableReadStream *s) {
return false;
_field0 = s->readUint32LE();
- _field4 = s->readUint32LE();
+ _category = s->readUint32LE();
_string8 = readStringFromStream(s);
_fieldC = s->readUint32LE();
_string10 = readStringFromStream(s);
diff --git a/engines/titanic/true_talk/script_support.h b/engines/titanic/true_talk/script_support.h
index ffd4f4885f..3c5b919ccf 100644
--- a/engines/titanic/true_talk/script_support.h
+++ b/engines/titanic/true_talk/script_support.h
@@ -65,7 +65,7 @@ struct TTscriptRange {
struct TTsentenceEntry {
int _field0;
- int _field4;
+ int _category;
CString _string8;
int _fieldC;
CString _string10;
@@ -78,7 +78,7 @@ struct TTsentenceEntry {
int _field2C;
int _field30;
- TTsentenceEntry() : _field0(0), _field4(0), _fieldC(0),
+ TTsentenceEntry() : _field0(0), _category(0), _fieldC(0),
_field20(0), _field28(0), _field2C(0), _field30(0) {}
/**
diff --git a/engines/titanic/true_talk/succubus_script.cpp b/engines/titanic/true_talk/succubus_script.cpp
index db537c6470..888d23e17c 100644
--- a/engines/titanic/true_talk/succubus_script.cpp
+++ b/engines/titanic/true_talk/succubus_script.cpp
@@ -85,7 +85,7 @@ int SuccUBusScript::process(const TTroomScript *roomScript, const TTsentence *se
int currState = getState();
if (currState) {
- int currMode = sentence->_field2C;
+ int currMode = sentence->_category;
bool modeFlag1 = currMode == 11 || currMode == 13;
bool modeFlag2 = currMode == 12;
setState(0);
diff --git a/engines/titanic/true_talk/tt_npc_script.cpp b/engines/titanic/true_talk/tt_npc_script.cpp
index ffa9d7f102..527e33f14c 100644
--- a/engines/titanic/true_talk/tt_npc_script.cpp
+++ b/engines/titanic/true_talk/tt_npc_script.cpp
@@ -700,12 +700,12 @@ int TTnpcScript::processEntries(const TTsentenceEntries *entries, uint entryCoun
if (!entryCount)
// No count specified, so use entire list
entryCount = entries->size();
- int entryId = _field2C;
+ int categoryNum = sentence->_category;
for (uint loopCtr = 0; loopCtr < 2; ++loopCtr) {
for (uint entryCtr = 0; entryCtr < entryCount; ++entryCtr) {
const TTsentenceEntry &entry = (*entries)[entryCtr];
- if (entry._field4 != entryId && (loopCtr == 0 || entry._field4))
+ if (entry._category != categoryNum && (loopCtr == 0 || entry._category))
continue;
bool flag;
@@ -956,7 +956,7 @@ bool TTnpcScript::getStateValue() const {
}
bool TTnpcScript::sentence2C(const TTsentence *sentence) {
- return sentence->_field2C >= 2 && sentence->_field2C <= 7;
+ return sentence->_category >= 2 && sentence->_category <= 7;
}
void TTnpcScript::getAssignedRoom(int *roomNum, int *floorNum, int *elevatorNum) const {
diff --git a/engines/titanic/true_talk/tt_parser.cpp b/engines/titanic/true_talk/tt_parser.cpp
index 28160a07ea..e432677c7c 100644
--- a/engines/titanic/true_talk/tt_parser.cpp
+++ b/engines/titanic/true_talk/tt_parser.cpp
@@ -622,7 +622,7 @@ int TTparser::loadRequests(TTword *word) {
break;
case WC_CONJUNCTION:
- if (_sentence->check2C()) {
+ if (_sentence->checkCategory()) {
_sentenceConcept->_field1C = 1;
_sentenceConcept = _sentenceConcept->addSibling();
delete this;
@@ -676,7 +676,7 @@ int TTparser::loadRequests(TTword *word) {
case 901:
case 902:
case 904:
- if (_sentence->_field2C == 9) {
+ if (_sentence->_category == 9) {
_sentenceConcept->_field1C = 1;
_sentenceConcept = _sentenceConcept->addSibling();
addNode(1);
@@ -738,7 +738,7 @@ int TTparser::considerRequests(TTword *word) {
for (TTparserNode *nodeP = _nodesP; nodeP; ) {
switch (nodeP->_tag) {
case CHECK_COMMAND_FORM:
- if (_sentenceConcept->_concept1P && _sentence->_field2C == 1 &&
+ if (_sentenceConcept->_concept1P && _sentence->_category == 1 &&
!_sentenceConcept->_concept0P) {
concept = new TTconcept(_sentence->_npcScript, ST_NPC_SCRIPT);
_sentenceConcept->_concept0P = concept;
@@ -1032,7 +1032,7 @@ int TTparser::considerRequests(TTword *word) {
addNode(15);
}
- if (_sentence->check2C() && word->_id == 113)
+ if (_sentence->checkCategory() && word->_id == 113)
addNode(4);
if (word->_wordClass == WC_ACTION)
@@ -1055,10 +1055,10 @@ int TTparser::considerRequests(TTword *word) {
break;
case WORD_TYPE_IS_SENTENCE_TYPE:
- if (_sentence->_field2C == 1 || _sentence->_field2C == 10) {
+ if (_sentence->_category == 1 || _sentence->_category == 10) {
for (TTword *wordP = _currentWordP; wordP; wordP = wordP->_nextP) {
if (wordP->_id == 906) {
- _sentence->_field2C = 12;
+ _sentence->_category = 12;
flag = true;
break;
}
@@ -1068,44 +1068,44 @@ int TTparser::considerRequests(TTword *word) {
TTconcept *newConceptP;
switch (word->_id) {
case 108:
- _sentence->_field2C = 8;
+ _sentence->_category = 8;
break;
case 113:
if (!_sentenceConcept->_concept3P)
- _sentence->_field2C = 22;
+ _sentence->_category = 22;
break;
- case 304:
- _sentence->_field2C = 25;
+ case 306:
+ _sentence->_category = 7;
break;
- case 305:
- _sentence->_field2C = 24;
+ case 307:
+ _sentence->_category = 24;
break;
- case 306:
- _sentence->_field2C = 7;
+ case 308:
+ _sentence->_category = 25;
break;
case 501:
- _sentence->_field2C = 9;
+ _sentence->_category = 9;
break;
case 900:
- _sentence->_field2C = 5;
+ _sentence->_category = 5;
break;
case 901:
- _sentence->_field2C = 4;
+ _sentence->_category = 4;
break;
case 904:
- _sentence->_field2C = 6;
+ _sentence->_category = 6;
break;
case 905:
- _sentence->_field2C = 11;
+ _sentence->_category = 11;
break;
case 906:
- _sentence->_field2C = 12;
+ _sentence->_category = 12;
break;
case 907:
- _sentence->_field2C = 13;
+ _sentence->_category = 13;
break;
case 908:
- _sentence->_field2C = 2;
+ _sentence->_category = 2;
if (!_sentenceConcept->_concept0P) {
newPictP = new TTpicture(TTstring("?"), WC_THING, 0, 0, 0, 0, 0);
newConceptP = new TTconcept(newPictP);
@@ -1116,7 +1116,7 @@ int TTparser::considerRequests(TTword *word) {
}
break;
case 909:
- _sentence->_field2C = 3;
+ _sentence->_category = 3;
newPictP = new TTpicture(TTstring("?"), WC_THING, 0, 0, 0, 0, 0);
newConceptP = new TTconcept(newPictP);
@@ -1154,8 +1154,8 @@ int TTparser::considerRequests(TTword *word) {
addNode(5);
addNode(21);
- if (!_sentence->_field2C)
- _sentence->_field2C = 15;
+ if (!_sentence->_category)
+ _sentence->_category = 15;
break;
case MKTAG('C', 'U', 'R', 'S'):
@@ -1170,8 +1170,8 @@ int TTparser::considerRequests(TTword *word) {
addNode(5);
addNode(21);
- if (!_sentence->_field2C)
- _sentence->_field2C = 14;
+ if (!_sentence->_category)
+ _sentence->_category = 14;
break;
case MKTAG('F', 'A', 'R', 'R'):
@@ -1188,15 +1188,15 @@ int TTparser::considerRequests(TTword *word) {
addNode(5);
addNode(21);
- if (_sentence->_field2C == 1)
- _sentence->_field2C = 14;
+ if (_sentence->_category == 1)
+ _sentence->_category = 14;
flag = true;
break;
case MKTAG('H', 'E', 'L', 'P'):
- if (_sentence->_field2C == 1)
- _sentence->_field2C = 18;
+ if (_sentence->_category == 1)
+ _sentence->_category = 18;
flag = true;
break;
@@ -1259,8 +1259,8 @@ int TTparser::considerRequests(TTword *word) {
break;
case MKTAG('T', 'E', 'A', 'C'):
- if (_sentence->_field2C == 1)
- _sentence->_field2C = 10;
+ if (_sentence->_category == 1)
+ _sentence->_category = 10;
flag = true;
break;
@@ -1404,8 +1404,8 @@ int TTparser::checkForAction() {
} else {
// No chain, so singular word can simply be removed
_currentWordP = nullptr;
- if (word->_id == 906 && _sentence->_field2C == 1)
- _sentence->_field2C = 12;
+ if (word->_id == 906 && _sentence->_category == 1)
+ _sentence->_category = 12;
}
if (word->_text == "do" || word->_text == "doing" || word->_text == "does" ||
@@ -1455,28 +1455,28 @@ int TTparser::checkForAction() {
if (_sentence->fn2(3, TTstring("thePlayer"), _sentenceConcept) && !flag) {
if (_sentenceConcept->concept1WordId() == 101) {
- _sentence->_field2C = 16;
- } else if (_sentence->_field2C != 18 && _sentenceConcept->concept1WordId() == 102) {
+ _sentence->_category = 16;
+ } else if (_sentence->_category != 18 && _sentenceConcept->concept1WordId() == 102) {
if (_sentence->fn2(0, TTstring("targetNpc"), _sentenceConcept))
- _sentence->_field2C = 15;
+ _sentence->_category = 15;
}
}
if (_sentence->fn2(2, TTstring("thePlayer"), _sentenceConcept) &&
_sentenceConcept->concept1WordId() == 101 && flag)
- _sentence->_field2C = 17;
+ _sentence->_category = 17;
if (!_sentenceConcept->_concept0P && !_sentenceConcept->_concept1P &&
!_sentenceConcept->_concept2P && !_sentenceConcept->_concept5P && !flag) {
if (_conceptP)
filterConcepts(5, 2);
- if (!_sentenceConcept->_concept2P && _sentence->_field2C == 1)
- _sentence->_field2C = 0;
+ if (!_sentenceConcept->_concept2P && _sentence->_category == 1)
+ _sentence->_category = 0;
}
- if (_sentence->_field58 < 5 && _sentence->_field2C == 1 && !flag)
- _sentence->_field2C = 19;
+ if (_sentence->_field58 < 5 && _sentence->_category == 1 && !flag)
+ _sentence->_category = 19;
for (TTconceptNode *nodeP = &_sentence->_sentenceConcept; nodeP; nodeP = nodeP->_nextP) {
if (nodeP->_field18 == 0 && nodeP->_concept1P) {
@@ -1492,15 +1492,15 @@ int TTparser::checkForAction() {
}
}
- if (_sentence->_field2C == 1 && _sentenceConcept->_concept5P &&
+ if (_sentence->_category == 1 && _sentenceConcept->_concept5P &&
_sentenceConcept->_concept2P) {
if (_sentence->fn4(1, 113, nullptr)) {
if (_sentence->fn2(2, TTstring("targetNpc"), nullptr)) {
- _sentence->_field2C = 20;
+ _sentence->_category = 20;
} else if (_sentence->fn2(2, TTstring("thePlayer"), nullptr)) {
- _sentence->_field2C = 21;
+ _sentence->_category = 21;
} else {
- _sentence->_field2C = 22;
+ _sentence->_category = 22;
}
}
} else if (!_sentenceConcept->_concept0P && !_sentenceConcept->_concept1P &&
@@ -1508,8 +1508,8 @@ int TTparser::checkForAction() {
if (_conceptP)
filterConcepts(5, 2);
- if (!_sentenceConcept->_concept2P && _sentence->_field2C == 1)
- _sentence->_field2C = 0;
+ if (!_sentenceConcept->_concept2P && _sentence->_category == 1)
+ _sentence->_category = 0;
}
return status;
@@ -1660,8 +1660,8 @@ int TTparser::processModifiers(int modifier, TTword *word) {
case 204:
newConcept->_field34 = 1;
- if (_sentence->_field2C == 1)
- _sentence->_field2C = 12;
+ if (_sentence->_category == 1)
+ _sentence->_category = 12;
newConcept->_field14 = 1;
break;
diff --git a/engines/titanic/true_talk/tt_sentence.cpp b/engines/titanic/true_talk/tt_sentence.cpp
index 9d7ea961f4..6bd7e091c2 100644
--- a/engines/titanic/true_talk/tt_sentence.cpp
+++ b/engines/titanic/true_talk/tt_sentence.cpp
@@ -41,7 +41,7 @@ TTsentenceConcept *TTsentenceConcept::addSibling() {
TTsentence::TTsentence(int inputCtr, const TTstring &line, CScriptHandler *owner,
TTroomScript *roomScript, TTnpcScript *npcScript) :
- _owner(owner), _field2C(1), _inputCtr(inputCtr), _field34(0),
+ _owner(owner), _category(1), _inputCtr(inputCtr), _field34(0),
_field38(0), _initialLine(line), _nodesP(nullptr), _roomScript(roomScript),
_npcScript(npcScript), _field58(0), _field5C(0) {
_status = _initialLine.isValid() && _normalizedLine.isValid() ? SS_11: SS_VALID;
@@ -77,7 +77,7 @@ void TTsentence::copyFrom(const TTsentence &src) {
_field5C = src._field5C;
_field34 = src._field34;
_field38 = src._field38;
- _field2C = src._field2C;
+ _category = src._category;
_nodesP = nullptr;
if (src._nodesP) {
diff --git a/engines/titanic/true_talk/tt_sentence.h b/engines/titanic/true_talk/tt_sentence.h
index 7b2c6400c5..cbaef26831 100644
--- a/engines/titanic/true_talk/tt_sentence.h
+++ b/engines/titanic/true_talk/tt_sentence.h
@@ -67,7 +67,7 @@ public:
int _field58;
TTroomScript *_roomScript;
TTnpcScript *_npcScript;
- int _field2C;
+ int _category;
public:
TTsentence(int inputCtr, const TTstring &line, CScriptHandler *owner,
TTroomScript *roomScript, TTnpcScript *npcScript);
@@ -76,7 +76,7 @@ public:
void setState(int v) { _field34 = v; }
void set38(int v) { _field38 = v; }
- bool check2C() const { return _field2C > 1 && _field2C <= 10; }
+ bool checkCategory() const { return _category > 1 && _category <= 10; }
int concept18(TTconceptNode *conceptNode) {
return conceptNode ? conceptNode->get18() : 0;
}