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

[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:
a99c6774ff DEVTOOLS: Add German bot quote lists to create_titanic


Commit: a99c6774ffd3b7686db63b3b66696bb290465e82
    https://github.com/scummvm/scummvm/commit/a99c6774ffd3b7686db63b3b66696bb290465e82
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-09-29T19:44:15-04:00

Commit Message:
DEVTOOLS: Add German bot quote lists to create_titanic

Changed paths:
    devtools/create_titanic/create_titanic_dat.cpp
    devtools/create_titanic/script_quotes.cpp
    devtools/create_titanic/script_quotes.h


diff --git a/devtools/create_titanic/create_titanic_dat.cpp b/devtools/create_titanic/create_titanic_dat.cpp
index 3a06464..9519e41 100644
--- a/devtools/create_titanic/create_titanic_dat.cpp
+++ b/devtools/create_titanic/create_titanic_dat.cpp
@@ -280,7 +280,7 @@ struct CommonPhrase {
 	uint _val1;
 };
 
-static const CommonPhrase BELLBOT_COMMON_PHRASES[] = {
+static const CommonPhrase BELLBOT_COMMON_PHRASES_EN[] = {
 	{ "what is wrong with her", 0x30FF9, 0x7B, 0 },
 	{ "what is wrong with titania", 0x30FF9, 0x7B, 0 },
 	{ "something for the weekend", 0x30D8B, 0x00, 0 },
@@ -1691,11 +1691,11 @@ void writeData() {
 	writeWords("Words/Deskbot", WORDS_DESKBOT[_version], 3);
 	writeWords("Words/Doorbot", WORDS_DOORBOT[_version], 3);
 	writeWords("Words/Liftbot", WORDS_LIFTBOT[_version]);
-	writePhrases("Phrases/Bellbot", BELLBOT_COMMON_PHRASES);
+	writePhrases("Phrases/Bellbot", BELLBOT_COMMON_PHRASES_EN);
 
 	writeResponseTree();
 	writeNumbers();
-	writeAllScriptQuotes();
+	writeAllScriptQuotesEN();
 	writeAllScriptResponses();
 	writeAllScriptRanges();
 
@@ -1729,6 +1729,7 @@ void writeGermanData() {
 	writeWords("Words/Deskbot/DE", 0x5FE8D8, 3);
 	writeWords("Words/Doorbot/DE", 0x61B398, 3);
 	writeWords("Words/Liftbot/DE", 0x629618);
+	writePhrases("Phrases/Bellbot/DE", BELLBOT_COMMON_PHRASES_DE);
 
 	const int SENTENCES_BARBOT[2] = { 0x5B00C0, 0x5C5AC8 };
 	const int SENTENCES_BELLBOT[20] = { 0x5CACF8, 0x5D1670 };
diff --git a/devtools/create_titanic/script_quotes.cpp b/devtools/create_titanic/script_quotes.cpp
index 4d6b990..a84bfe2 100644
--- a/devtools/create_titanic/script_quotes.cpp
+++ b/devtools/create_titanic/script_quotes.cpp
@@ -447,7 +447,7 @@ void writeScriptQuotes(const char *name, const ScriptQuote *quotes,
 	dataOffset += size;
 }
 
-void writeAllScriptQuotes() {
+void writeAllScriptQuotesEN() {
 	writeScriptQuotes("Quotes/Barbot", BARBOT_QUOTES, 221376, 221375, 0, 999);
 	writeScriptQuotes("Quotes/Bellbot", BELLBOT_QUOTES, 201687, 201686, 270000, 270500);
 	writeScriptQuotes("Quotes/Deskbot", DESKBOT_QUOTES, 241191, 241166, 270000, 270500);
@@ -455,3 +455,12 @@ void writeAllScriptQuotes() {
 	writeScriptQuotes("Quotes/Liftbot", LIFTBOT_QUOTES, 210581, 210580, 0, 999);
 	writeScriptQuotes("Quotes/MaitreD", MAITRED_QUOTES, 260167, 260147, 270000, 270500);
 }
+
+void writeAllScriptQuotesDE() {
+	writeScriptQuotes("Quotes/Barbot/DE", BARBOT_QUOTES, 251682, 250738, 0, 999);
+	writeScriptQuotes("Quotes/Bellbot", BELLBOT_QUOTES, 201686, 201687, 270000, 270500);
+	writeScriptQuotes("Quotes/Deskbot", DESKBOT_QUOTES, 241166, 241191, 270000, 270500);
+	writeScriptQuotes("Quotes/Doorbot", DOORBOT_QUOTES, 221375, 221376, 0, 999);
+	writeScriptQuotes("Quotes/Liftbot", LIFTBOT_QUOTES, 210580, 210581, 0, 999);
+	writeScriptQuotes("Quotes/MaitreD", MAITRED_QUOTES, 260147, 260167, 270000, 270500);
+}
diff --git a/devtools/create_titanic/script_quotes.h b/devtools/create_titanic/script_quotes.h
index 5b4f25c..e282ec5 100644
--- a/devtools/create_titanic/script_quotes.h
+++ b/devtools/create_titanic/script_quotes.h
@@ -31,7 +31,8 @@ struct ScriptQuote {
 	uint _dialogueId;
 };
 
-extern void writeAllScriptQuotes();
+extern void writeAllScriptQuotesEN();
+extern void writeAllScriptQuotesDE();
 extern void writeEntryHeader(const char *name, uint offset, uint size);
 extern uint dataOffset;