[Scummvm-cvs-logs] scummvm master -> 67695213a65098248776f58f2a67b10bf3427204
dreammaster
dreammaster at scummvm.org
Tue Aug 2 02:59:33 CEST 2016
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:
67695213a6 TITANIC: Added MaitreDScript methods
Commit: 67695213a65098248776f58f2a67b10bf3427204
https://github.com/scummvm/scummvm/commit/67695213a65098248776f58f2a67b10bf3427204
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-08-01T20:59:24-04:00
Commit Message:
TITANIC: Added MaitreDScript methods
Changed paths:
engines/titanic/true_talk/maitred_script.cpp
engines/titanic/true_talk/maitred_script.h
engines/titanic/true_talk/tt_script_base.h
diff --git a/engines/titanic/true_talk/maitred_script.cpp b/engines/titanic/true_talk/maitred_script.cpp
index 688e635..26d0b99 100644
--- a/engines/titanic/true_talk/maitred_script.cpp
+++ b/engines/titanic/true_talk/maitred_script.cpp
@@ -141,8 +141,223 @@ int MaitreDScript::process(const TTroomScript *roomScript, const TTsentence *sen
}
ScriptChangedResult MaitreDScript::scriptChanged(const TTroomScript *roomScript, uint id) {
- warning("TODO");
- return SCR_1;
+ resetFlags();
+ bool flag1 = false, flag2 = false;
+
+ switch (id) {
+ case 3:
+ if (getValue(4))
+ addResponse(getDialogueId(260655));
+ else if (getValue(12))
+ addResponse(getDialogueId(260622));
+ else if (getValue(9) && getValue(16))
+ addResponse(getDialogueId(getValue(16)));
+ else if (getValue(15))
+ addResponse(getDialogueId(260649));
+ else
+ addResponse(getDialogueId(260112));
+
+ CTrueTalkManager::setFlags(16, 0);
+ CTrueTalkManager::setFlags(15, 1);
+ applyResponse();
+ break;
+
+ case 110:
+ addResponse(getDialogueId(260118));
+ applyResponse();
+ trigger12(true);
+ CTrueTalkManager::setFlags(8, 1);
+ CTrueTalkManager::setFlags(9, 1);
+ break;
+
+ case 111:
+ CTrueTalkManager::setFlags(16, 260680);
+ CTrueTalkManager::setFlags(8, 0);
+ CTrueTalkManager::setFlags(9, 1);
+ break;
+
+ case 112:
+ addResponse(getDialogueId(getValue(8) ? 260095 : 260127));
+ applyResponse();
+ break;
+
+ case 113:
+ CTrueTalkManager::setFlags(16, 260266);
+ CTrueTalkManager::setFlags(8, 0);
+ CTrueTalkManager::setFlags(9, 1);
+ break;
+
+ case 114:
+ CTrueTalkManager::setFlags(16, 260267);
+ CTrueTalkManager::setFlags(8, 0);
+ CTrueTalkManager::setFlags(9, 1);
+ break;
+
+ case 115:
+ CTrueTalkManager::setFlags(16, 260268);
+ CTrueTalkManager::setFlags(8, 0);
+ CTrueTalkManager::setFlags(9, 1);
+ break;
+
+ case 116:
+ CTrueTalkManager::setFlags(8, 0);
+ CTrueTalkManager::setFlags(9, 1);
+ break;
+
+ case 117:
+ CTrueTalkManager::setFlags(8, 0);
+ CTrueTalkManager::setFlags(9, 0);
+ setFlags12();
+ break;
+
+ case 132:
+ addResponse(getDialogueId(260655));
+ applyResponse();
+ break;
+
+ default:
+ flag1 = true;
+ break;
+ }
+
+ if (!getValue(8)) {
+ switch (id - 118) {
+ case 0:
+ addResponse(getDialogueId(260676));
+ applyResponse();
+ break;
+ case 1:
+ addResponse(getDialogueId(260677));
+ applyResponse();
+ break;
+ case 2:
+ addResponse(getDialogueId(260189));
+ applyResponse();
+ break;
+ case 3:
+ case 4:
+ case 5:
+ case 6:
+ case 7:
+ CTrueTalkManager::setFlags(13, id - 120);
+ break;
+ case 8:
+ CTrueTalkManager::setFlags(13, 0);
+ break;
+ case 9:
+ if (!getValue(12)) {
+ addResponse(getDialogueId(getValue(14) == 1 ? 260063 : 260120));
+ applyResponse();
+ } else if (getRandomNumber(4) == 1) {
+ addResponse(getDialogueId(260067));
+ applyResponse();
+ } else {
+ addResponse(getDialogueId(260131));
+ applyResponse();
+ }
+ break;
+
+ case 10:
+ if (getValue(12) == 0) {
+ addResponse(getDialogueId(getValue(14) == 1 ? 260063 : 260119));
+ applyResponse();
+ } else if (getRandomNumber(4) == 1) {
+ addResponse(getDialogueId(260077));
+ applyResponse();
+ } else {
+ addResponse(getDialogueId(260131));
+ applyResponse();
+ }
+ break;
+
+ case 11:
+ if (getValue(12)) {
+ addResponse(getDialogueId(260121));
+ applyResponse();
+ } else {
+ addResponse(getDialogueId(getValue(14) == 1 ? 260063 : 260119));
+ applyResponse();
+ }
+ break;
+
+ case 12:
+ if (getValue(12)) {
+ addResponse(getDialogueId(260131));
+ applyResponse();
+ } else {
+ addResponse(getDialogueId(getValue(14) == 1 ? 260063 : 260119));
+ applyResponse();
+ }
+ break;
+
+ case 13:
+ setFlags12();
+ addResponse(getDialogueId(260131));
+ applyResponse();
+ break;
+
+ case 15:
+ CTrueTalkManager::setFlags(13, 1);
+ if (getValue(12)) {
+ addResponse(getDialogueId(260122));
+ applyResponse();
+ } else {
+ addResponse(getDialogueId(getValue(14) == 1 ? 260063 : 260119));
+ applyResponse();
+ }
+ break;
+
+ case 16:
+ CTrueTalkManager::setFlags(13, 2);
+ if (getValue(12)) {
+ addResponse(getDialogueId(260123));
+ applyResponse();
+ } else {
+ addResponse(getDialogueId(getValue(14) == 1 ? 260063 : 260119));
+ applyResponse();
+ }
+ break;
+
+ case 17:
+ CTrueTalkManager::setFlags(13, 3);
+ if (getValue(12)) {
+ addResponse(getDialogueId(260124));
+ applyResponse();
+ } else {
+ addResponse(getDialogueId(getValue(14) == 1 ? 260063 : 260119));
+ applyResponse();
+ }
+ break;
+
+ case 18:
+ CTrueTalkManager::setFlags(13, 4);
+ if (getValue(12)) {
+ addResponse(getDialogueId(260125));
+ applyResponse();
+ } else {
+ addResponse(getDialogueId(getValue(14) == 1 ? 260063 : 260119));
+ applyResponse();
+ }
+ break;
+
+ case 19:
+ CTrueTalkManager::setFlags(13, 5);
+ if (getValue(12)) {
+ addResponse(getDialogueId(260126));
+ applyResponse();
+ } else {
+ addResponse(getDialogueId(getValue(14) == 1 ? 260063 : 260119));
+ applyResponse();
+ }
+ break;
+
+ default:
+ flag2 = true;
+ break;
+ }
+ }
+
+ return !flag1 || !flag2 ? SCR_2 : SCR_0;
}
int MaitreDScript::handleQuote(const TTroomScript *roomScript, const TTsentence *sentence,
@@ -371,11 +586,6 @@ int MaitreDScript::preResponse(uint id) {
return 0;
}
-int MaitreDScript::doSentenceEntry(int val1, const int *srcIdP, const TTroomScript *roomScript, const TTsentence *sentence) {
- warning("TODO");
- return 0;
-}
-
uint MaitreDScript::getStateDialogueId(uint oldId, uint newId) {
if (getValue(8) || getValue(9))
return newId;
diff --git a/engines/titanic/true_talk/maitred_script.h b/engines/titanic/true_talk/maitred_script.h
index 93004e2..0472050 100644
--- a/engines/titanic/true_talk/maitred_script.h
+++ b/engines/titanic/true_talk/maitred_script.h
@@ -94,11 +94,6 @@ public:
* Handles getting a pre-response
*/
virtual int preResponse(uint id);
-
- /**
- * Process a sentence fragment entry
- */
- virtual int doSentenceEntry(int val1, const int *srcIdP, const TTroomScript *roomScript, const TTsentence *sentence);
};
} // End of namespace Titanic
diff --git a/engines/titanic/true_talk/tt_script_base.h b/engines/titanic/true_talk/tt_script_base.h
index 3377aaa..c489dcb 100644
--- a/engines/titanic/true_talk/tt_script_base.h
+++ b/engines/titanic/true_talk/tt_script_base.h
@@ -31,7 +31,7 @@
namespace Titanic {
enum ScriptChangedResult {
- SCR_1 = 1, SCR_2 = 2, SCR_3 = 3, SCR_4 = 4, SCR_5 = 5
+ SCR_0 = 0, SCR_1 = 1, SCR_2 = 2, SCR_3 = 3, SCR_4 = 4, SCR_5 = 5
};
class TTsentence;
More information about the Scummvm-git-logs
mailing list