From 481e18ee1d38512e9d1c730b357b230d5db22cae Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 17 Sep 2017 16:24:26 -0400 Subject: TITANIC: Create a separate g_language global in it's own file I was becoming concerned with more and more files having to add the full engine definition and sub-classes thereof via titanic.h, just so the TRANSLATE macro could call getLanguage. This way, files just need to include the lightweight translation.h file instead --- engines/titanic/true_talk/doorbot_script.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'engines/titanic/true_talk/doorbot_script.cpp') diff --git a/engines/titanic/true_talk/doorbot_script.cpp b/engines/titanic/true_talk/doorbot_script.cpp index 84c0548871..ab50eca0c6 100644 --- a/engines/titanic/true_talk/doorbot_script.cpp +++ b/engines/titanic/true_talk/doorbot_script.cpp @@ -24,6 +24,7 @@ #include "titanic/true_talk/doorbot_script.h" #include "titanic/true_talk/tt_room_script.h" #include "titanic/true_talk/true_talk_manager.h" +#include "titanic/translation.h" #include "titanic/titanic.h" namespace Titanic { @@ -546,10 +547,10 @@ ScriptChangedResult DoorbotScript::scriptChanged(const TTroomScript *roomScript, CTrueTalkManager::setFlags(39, 0); } - if (id >= 220000 && id <= TRANSLATE(222418, 222430)) { + if (id >= 220000 && id <= (uint)TRANSLATE(222418, 222430)) { addResponse(getDialogueId(id)); applyResponse(); - } else if (id >= 10000 && id <= TRANSLATE(11986, 11999)) { + } else if (id >= 10000 && id <= (uint)TRANSLATE(11986, 11999)) { addResponse(id); applyResponse(); } -- cgit v1.2.3