From 6cac39b646344ce085ad4d1b4e5836d25eb78019 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 16 Sep 2017 22:03:36 -0400 Subject: TITANIC: Add differing response Id range checks for German --- engines/titanic/titanic.h | 2 +- engines/titanic/true_talk/doorbot_script.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'engines/titanic') diff --git a/engines/titanic/titanic.h b/engines/titanic/titanic.h index d60bbf6d10..1708df7d78 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 0323e3d021..84c0548871 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(); } -- cgit v1.2.3