[Scummvm-git-logs] scummvm master -> 787392fe11753d3dfc430edff6334926703b5810

dreammaster dreammaster at scummvm.org
Sun Sep 17 04:04:30 CEST 2017


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6cac39b646 TITANIC: Add differing response Id range checks for German
787392fe11 DEVTOOLS: Add German Id mappings for Doorbot in create_titanic


Commit: 6cac39b646344ce085ad4d1b4e5836d25eb78019
    https://github.com/scummvm/scummvm/commit/6cac39b646344ce085ad4d1b4e5836d25eb78019
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-09-16T22:03:36-04:00

Commit Message:
TITANIC: Add differing response Id range checks for German

Changed paths:
    engines/titanic/titanic.h
    engines/titanic/true_talk/doorbot_script.cpp


diff --git a/engines/titanic/titanic.h b/engines/titanic/titanic.h
index d60bbf6..1708df7 100644
--- a/engines/titanic/titanic.h
+++ b/engines/titanic/titanic.h
@@ -63,7 +63,7 @@ namespace Titanic {
 
 #define MAX_SAVES 99
 
-#define TRANSLATE(enName, deName) (g_vm->isGerman() ? deName : enName)
+#define TRANSLATE(enVal, deVal) (g_vm->isGerman() ? deVal : enVal)
 
 // If enabled, fixes an original bug where dispensed chickens weren't
 // meant to be hot unless the Yellow fuse was left in the Fusebox.
diff --git a/engines/titanic/true_talk/doorbot_script.cpp b/engines/titanic/true_talk/doorbot_script.cpp
index 0323e3d..84c0548 100644
--- a/engines/titanic/true_talk/doorbot_script.cpp
+++ b/engines/titanic/true_talk/doorbot_script.cpp
@@ -546,10 +546,10 @@ ScriptChangedResult DoorbotScript::scriptChanged(const TTroomScript *roomScript,
 		CTrueTalkManager::setFlags(39, 0);
 	}
 
-	if (id >= 220000 && id <= 222418) {
+	if (id >= 220000 && id <= TRANSLATE(222418, 222430)) {
 		addResponse(getDialogueId(id));
 		applyResponse();
-	} else if (id >= 10000 && id <= 11986) {
+	} else if (id >= 10000 && id <= TRANSLATE(11986, 11999)) {
 		addResponse(id);
 		applyResponse();
 	}


Commit: 787392fe11753d3dfc430edff6334926703b5810
    https://github.com/scummvm/scummvm/commit/787392fe11753d3dfc430edff6334926703b5810
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-09-16T22:04:22-04:00

Commit Message:
DEVTOOLS: Add German Id mappings for Doorbot in create_titanic

Changed paths:
    devtools/create_titanic/create_titanic_dat.cpp


diff --git a/devtools/create_titanic/create_titanic_dat.cpp b/devtools/create_titanic/create_titanic_dat.cpp
index 2f6d675..cacc77f 100644
--- a/devtools/create_titanic/create_titanic_dat.cpp
+++ b/devtools/create_titanic/create_titanic_dat.cpp
@@ -1713,7 +1713,7 @@ void writeGermanData() {
 	writeStringArray("TEXT/REPLACEMENTS3/DE", 0x2413B0 + GERMAN_DIFF, 608);
 	writeStringArray("TEXT/REPLACEMENTS4/DE", 0x241D38 + GERMAN_DIFF, 195);
 	writeStringArray("TEXT/PRONOUNS/DE", 0x248610 + GERMAN_DIFF, 15);
-
+	writeSentenceMappings("Mappings/Doorbot/DE", 0x214E00 + GERMAN_DIFF, 4);
 
 	const int SENTENCES_BARBOT[2] = { 0x5B00C0, 0x5C5AC8 };
 	const int SENTENCES_BELLBOT[20] = { 0x5CACF8, 0x5D1670 };





More information about the Scummvm-git-logs mailing list