diff options
author | Paul Gilbert | 2017-09-23 21:18:25 -0400 |
---|---|---|
committer | Paul Gilbert | 2017-09-23 21:18:25 -0400 |
commit | d74e94950b0945b66a478063a65fdf645208bd9d (patch) | |
tree | 72f15dca9b998735693e6a4f78da1b90e23228a6 /engines | |
parent | e5cad39a58b8b3ce517c37eb36ffd7a3fc5522f6 (diff) | |
download | scummvm-rg350-d74e94950b0945b66a478063a65fdf645208bd9d.tar.gz scummvm-rg350-d74e94950b0945b66a478063a65fdf645208bd9d.tar.bz2 scummvm-rg350-d74e94950b0945b66a478063a65fdf645208bd9d.zip |
TITANIC: DE: Merged German NPC script subclasses back in
There ended up not being enough custom German code in the scripts
to warrant having sub-classes that reimplemented entire methods
Diffstat (limited to 'engines')
20 files changed, 149 insertions, 793 deletions
diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk index 8c5cdd6446..617e262396 100644 --- a/engines/titanic/module.mk +++ b/engines/titanic/module.mk @@ -484,14 +484,6 @@ MODULE_OBJS := \ support/text_cursor.o \ support/time_event_info.o \ support/video_surface.o \ - true_talk/german/barbot_script.o \ - true_talk/german/bellbot_script.o \ - true_talk/german/deskbot_script.o \ - true_talk/german/doorbot_script.o \ - true_talk/german/liftbot_script.o \ - true_talk/german/maitred_script.o \ - true_talk/german/parrot_script.o \ - true_talk/german/succubus_script.o \ true_talk/barbot_script.o \ true_talk/bellbot_script.o \ true_talk/deskbot_script.o \ diff --git a/engines/titanic/true_talk/bellbot_script.cpp b/engines/titanic/true_talk/bellbot_script.cpp index 60a692c89b..84d5c59713 100644 --- a/engines/titanic/true_talk/bellbot_script.cpp +++ b/engines/titanic/true_talk/bellbot_script.cpp @@ -730,86 +730,159 @@ int BellbotScript::preResponse(uint id) { } int BellbotScript::doSentenceEntry(int val1, const int *srcIdP, const TTroomScript *roomScript, const TTsentence *sentence) { - switch (val1) { - case 1: - addResponse(getDialogueId(*srcIdP)); - applyResponse(); - return 2; - - case 2: - addResponse(getDialogueId(*srcIdP)); - addResponse(getDialogueId(getRandomNumber(2) == 1 ? 200192 : 200157)); - addResponse(getDialogueId(200176)); - applyResponse(); - return 2; + if (g_language == Common::EN_ANY) { + switch (val1) { + case 1: + addResponse(getDialogueId(*srcIdP)); + applyResponse(); + return 2; - case 21: - if (CTrueTalkManager::getStateValue(7) == 0) { - selectResponse(21372); + case 2: + addResponse(getDialogueId(*srcIdP)); + addResponse(getDialogueId(getRandomNumber(2) == 1 ? 200192 : 200157)); + addResponse(getDialogueId(200176)); applyResponse(); return 2; - } - if (!sentence->localWord("broken") && !sentence->contains("broken") && + case 21: + if (CTrueTalkManager::getStateValue(7) == 0) { + selectResponse(21372); + applyResponse(); + return 2; + } + + if (!sentence->localWord("broken") && !sentence->contains("broken") && CTrueTalkManager::_currentNPC) { - CNodeItem *node = CTrueTalkManager::_currentNPC->getNode(); - if (node) { - CString nodeName = node->getName(); - if (nodeName.containsIgnoreCase("5") || nodeName.containsIgnoreCase("6") + CNodeItem *node = CTrueTalkManager::_currentNPC->getNode(); + if (node) { + CString nodeName = node->getName(); + if (nodeName.containsIgnoreCase("5") || nodeName.containsIgnoreCase("6") || nodeName.containsIgnoreCase("7")) { - CTrueTalkManager::triggerAction(29, 2); - selectResponse(201571); - applyResponse(); - return 2; + CTrueTalkManager::triggerAction(29, 2); + selectResponse(201571); + applyResponse(); + return 2; + } } } - } - CTrueTalkManager::triggerAction(29, 1); - selectResponse(201771); - applyResponse(); - return 2; + CTrueTalkManager::triggerAction(29, 1); + selectResponse(201771); + applyResponse(); + return 2; - case 22: - if (CTrueTalkManager::getStateValue(7) == 0) { - selectResponse(21372); + case 22: + if (CTrueTalkManager::getStateValue(7) == 0) { + selectResponse(21372); + applyResponse(); + return 2; + } + + if (!sentence->localWord("broken") && !sentence->contains("broken") && + CTrueTalkManager::_currentNPC) { + CNodeItem *node = CTrueTalkManager::_currentNPC->getNode(); + if (node) { + CString nodeName = node->getName(); + if (nodeName.containsIgnoreCase("5") || nodeName.containsIgnoreCase("6") + || nodeName.containsIgnoreCase("7")) { + CTrueTalkManager::triggerAction(29, 2); + selectResponse(201571); + applyResponse(); + return 2; + } + } + } + + CTrueTalkManager::triggerAction(29, 1); + selectResponse(201771); applyResponse(); return 2; + + case 23: + case 24: + if (CTrueTalkManager::getStateValue(7) == 0) { + selectResponse(21372); + applyResponse(); + return 2; + } + + CTrueTalkManager::triggerAction(29, val1 == 23 ? 3 : 4); + break; + + default: + break; } + } else { + switch (val1) { + case 5001: + case 5021: + return 0; + + case 5002: + addResponse(getDialogueId(*srcIdP)); + addResponse(getDialogueId(200000)); + applyResponse(); + return 2; - if (!sentence->localWord("broken") && !sentence->contains("broken") && - CTrueTalkManager::_currentNPC) { - CNodeItem *node = CTrueTalkManager::_currentNPC->getNode(); - if (node) { - CString nodeName = node->getName(); - if (nodeName.containsIgnoreCase("5") || nodeName.containsIgnoreCase("6") - || nodeName.containsIgnoreCase("7")) { + case 5003: + addResponse(getDialogueId(*srcIdP)); + return 2; + + case 5022: + case 5023: + if (CTrueTalkManager::getStateValue(7)) { + bool flag = true; + + if (!sentence->localWord("broken") && !sentence->contains("kaputt") && + !sentence->contains("im eimer") && !sentence->contains("funktioniert nicht") && + CTrueTalkManager::_currentNPC) { + CNodeItem *node = CTrueTalkManager::_currentNPC->getNode(); + if (node) { + CString nodeName = node->getName(); + if (nodeName.contains("5") || nodeName.contains("6") || nodeName.contains("7")) + flag = false; + } + } + + if (flag) { + CTrueTalkManager::triggerAction(29, 1); + selectResponse(201771); + } + else { CTrueTalkManager::triggerAction(29, 2); - selectResponse(201571); - applyResponse(); - return 2; + selectResponse(201554); } } - } + else { + selectResponse(21378); + } - CTrueTalkManager::triggerAction(29, 1); - selectResponse(201771); - applyResponse(); - return 2; + applyResponse(); + return 2; - case 23: - case 24: - if (CTrueTalkManager::getStateValue(7) == 0) { - selectResponse(21372); + case 5024: + if (CTrueTalkManager::getStateValue(7)) { + CTrueTalkManager::triggerAction(29, 3); + return 0; + } + + selectResponse(21378); applyResponse(); return 2; - } - CTrueTalkManager::triggerAction(29, val1 == 23 ? 3 : 4); - break; + case 5025: + if (CTrueTalkManager::getStateValue(7)) { + CTrueTalkManager::triggerAction(29, 4); + return 0; + } - default: - break; + selectResponse(21378); + applyResponse(); + return 2; + + default: + return TTnpcScript::doSentenceEntry(val1, srcIdP, roomScript, sentence); + } } return 0; diff --git a/engines/titanic/true_talk/deskbot_script.cpp b/engines/titanic/true_talk/deskbot_script.cpp index eb782165d2..cd3db1e1f1 100644 --- a/engines/titanic/true_talk/deskbot_script.cpp +++ b/engines/titanic/true_talk/deskbot_script.cpp @@ -364,10 +364,15 @@ exit: int DeskbotScript::preResponse(uint id) { int newId = 0; - if (getValue(1) >= 3 && (id == 41176 || id == 41738 || id == 41413 || id == 41740)) + if (getValue(1) >= 3 && ( + id == TRANSLATE(41176, 41190) || + id == TRANSLATE(41738, 41429) || + id == TRANSLATE(41413, 41755) || + id == TRANSLATE(41740, 41757) + )) { newId = 241601; - - if (id == 42114) + } + if (id == TRANSLATE(42114, 42132)) CTrueTalkManager::triggerAction(20, 0); return newId; @@ -383,6 +388,9 @@ uint DeskbotScript::getDialsBitset() const { int DeskbotScript::doSentenceEntry(int val1, const int *srcIdP, const TTroomScript *roomScript, const TTsentence *sentence) { uint id; + if (g_language == Common::DE_DEU && val1 != 4501) + return TTnpcScript::doSentenceEntry(val1, srcIdP, roomScript, sentence); + switch (val1) { case 1: id = *srcIdP; diff --git a/engines/titanic/true_talk/german/barbot_script.cpp b/engines/titanic/true_talk/german/barbot_script.cpp deleted file mode 100644 index 3a8177696a..0000000000 --- a/engines/titanic/true_talk/german/barbot_script.cpp +++ /dev/null @@ -1,29 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#include "titanic/true_talk/german/barbot_script.h" - -namespace Titanic { -namespace German { - -} // End of namespace German -} // End of namespace Titanic diff --git a/engines/titanic/true_talk/german/barbot_script.h b/engines/titanic/true_talk/german/barbot_script.h deleted file mode 100644 index 2d1c25d6b2..0000000000 --- a/engines/titanic/true_talk/german/barbot_script.h +++ /dev/null @@ -1,41 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#ifndef TITANIC_BARBOT_SCRIPT_DE_H -#define TITANIC_BARBOT_SCRIPT_DE_H - -#include "titanic/true_talk/barbot_script.h" - -namespace Titanic { -namespace German { - -class BarbotScript : public ::Titanic::BarbotScript { -public: - BarbotScript(int val1, const char *charClass, int v2, - const char *charName, int v3, int val2, int v4, int v5, int v6, int v7) : - ::Titanic::BarbotScript(val1, charClass, v2, charName, v3, val2, v4, v5, v6, v7) {} -}; - -} // End of namespace German -} // End of namespace Titanic - -#endif /* TITANIC_BARBOT_SCRIPT_DE_H */ diff --git a/engines/titanic/true_talk/german/bellbot_script.cpp b/engines/titanic/true_talk/german/bellbot_script.cpp deleted file mode 100644 index 1f82fb031e..0000000000 --- a/engines/titanic/true_talk/german/bellbot_script.cpp +++ /dev/null @@ -1,103 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#include "titanic/true_talk/german/bellbot_script.h" -#include "titanic/true_talk/true_talk_manager.h" - -namespace Titanic { -namespace German { - -int BellbotScript::doSentenceEntry(int val1, const int *srcIdP, const TTroomScript *roomScript, const TTsentence *sentence) { - switch (val1) { - case 5001: - case 5021: - return 0; - - case 5002: - addResponse(getDialogueId(*srcIdP)); - addResponse(getDialogueId(200000)); - applyResponse(); - return 2; - - case 5003: - addResponse(getDialogueId(*srcIdP)); - return 2; - - case 5022: - case 5023: - if (CTrueTalkManager::getStateValue(7)) { - bool flag = true; - - if (!sentence->localWord("broken") && !sentence->contains("kaputt") && - !sentence->contains("im eimer") && !sentence->contains("funktioniert nicht") && - CTrueTalkManager::_currentNPC) { - CNodeItem *node = CTrueTalkManager::_currentNPC->getNode(); - if (node) { - CString nodeName = node->getName(); - if (nodeName.contains("5") || nodeName.contains("6") || nodeName.contains("7")) - flag = false; - } - } - - if (flag) { - CTrueTalkManager::triggerAction(29, 1); - selectResponse(201771); - } - else { - CTrueTalkManager::triggerAction(29, 2); - selectResponse(201554); - } - } - else { - selectResponse(21378); - } - - applyResponse(); - return 2; - - case 5024: - if (CTrueTalkManager::getStateValue(7)) { - CTrueTalkManager::triggerAction(29, 3); - return 0; - } - - selectResponse(21378); - applyResponse(); - return 2; - - case 5025: - if (CTrueTalkManager::getStateValue(7)) { - CTrueTalkManager::triggerAction(29, 4); - return 0; - } - - selectResponse(21378); - applyResponse(); - return 2; - - default: - return TTnpcScript::doSentenceEntry(val1, srcIdP, roomScript, sentence); - } -} - -} // End of namespace German -} // End of namespace Titanic diff --git a/engines/titanic/true_talk/german/bellbot_script.h b/engines/titanic/true_talk/german/bellbot_script.h deleted file mode 100644 index 4670c02e94..0000000000 --- a/engines/titanic/true_talk/german/bellbot_script.h +++ /dev/null @@ -1,46 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#ifndef TITANIC_BELLBOT_SCRIPT_DE_H -#define TITANIC_BELLBOT_SCRIPT_DE_H - -#include "titanic/true_talk/bellbot_script.h" - -namespace Titanic { -namespace German { - -class BellbotScript : public ::Titanic::BellbotScript { -public: - BellbotScript(int val1, const char *charClass, int v2, - const char *charName, int v3, int val2) : - ::Titanic::BellbotScript(val1, charClass, v2, charName, v3, val2) {} - - /** - * Process a sentence fragment entry - */ - virtual int doSentenceEntry(int val1, const int *srcIdP, const TTroomScript *roomScript, const TTsentence *sentence); -}; - -} // End of namespace German -} // End of namespace Titanic - -#endif /* TITANIC_BELLBOT_SCRIPT_DE_H */ diff --git a/engines/titanic/true_talk/german/deskbot_script.cpp b/engines/titanic/true_talk/german/deskbot_script.cpp deleted file mode 100644 index c4d4d3703c..0000000000 --- a/engines/titanic/true_talk/german/deskbot_script.cpp +++ /dev/null @@ -1,78 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#include "titanic/true_talk/german/deskbot_script.h" -#include "titanic/true_talk/true_talk_manager.h" - -namespace Titanic { -namespace German { - -int DeskbotScript::preResponse(uint id) { - int newId = 0; - if (getValue(1) >= 3 && (id == 41190 || id == 41429 || id == 41755 || id == 41757)) - newId = 241601; - - if (id == 42132) - CTrueTalkManager::triggerAction(20, 0); - - return newId; -} - -int DeskbotScript::doSentenceEntry(int val1, const int *srcIdP, const TTroomScript *roomScript, const TTsentence *sentence) { - if (val1 != 4501) - return TTnpcScript::doSentenceEntry(val1, srcIdP, roomScript, sentence); - - int v = getValue(1); - int tagId = *srcIdP; - - switch (v) { - case 1: - tagId = 240336; - break; - - case 2: - tagId = addAssignedRoomDialogue(); - break; - - case 3: - if (tagId == 240431 || tagId == 240432) { - if (getValue(v) == 1) { - if (tagId == 240431) - tagId = 240432; - } else { - if (tagId == 240432) - tagId = 240431; - } - } - break; - - default: - break; - } - - addResponse(getDialogueId(tagId)); - applyResponse(); - return 2; -} - -} // End of namespace German -} // End of namespace Titanic diff --git a/engines/titanic/true_talk/german/deskbot_script.h b/engines/titanic/true_talk/german/deskbot_script.h deleted file mode 100644 index c3719c85d0..0000000000 --- a/engines/titanic/true_talk/german/deskbot_script.h +++ /dev/null @@ -1,51 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#ifndef TITANIC_DESKBOT_SCRIPT_DE_H -#define TITANIC_DESKBOT_SCRIPT_DE_H - -#include "titanic/true_talk/deskbot_script.h" - -namespace Titanic { -namespace German { - -class DeskbotScript : public ::Titanic::DeskbotScript { -public: - DeskbotScript(int val1, const char *charClass, int v2, - const char *charName, int v3, int val2) : - ::Titanic::DeskbotScript(val1, charClass, v2, charName, v3, val2) {} - - /** - * 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 German -} // End of namespace Titanic - -#endif /* TITANIC_DESKBOT_SCRIPT_DE_H */ diff --git a/engines/titanic/true_talk/german/doorbot_script.cpp b/engines/titanic/true_talk/german/doorbot_script.cpp deleted file mode 100644 index 58d9eac658..0000000000 --- a/engines/titanic/true_talk/german/doorbot_script.cpp +++ /dev/null @@ -1,29 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#include "titanic/true_talk/german/doorbot_script.h" - -namespace Titanic { -namespace German { - -} // End of namespace German -} // End of namespace Titanic diff --git a/engines/titanic/true_talk/german/doorbot_script.h b/engines/titanic/true_talk/german/doorbot_script.h deleted file mode 100644 index 1653f42d40..0000000000 --- a/engines/titanic/true_talk/german/doorbot_script.h +++ /dev/null @@ -1,41 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#ifndef TITANIC_DOORBOT_SCRIPT_DE_H -#define TITANIC_DOORBOT_SCRIPT_DE_H - -#include "titanic/true_talk/doorbot_script.h" - -namespace Titanic { -namespace German { - -class DoorbotScript : public ::Titanic::DoorbotScript { -public: - DoorbotScript(int val1, const char *charClass, int v2, - const char *charName, int v3, int val2, int v4, int v5, int v6, int v7) : - ::Titanic::DoorbotScript(val1, charClass, v2, charName, v3, val2, v4, v5, v6, v7) {} -}; - -} // End of namespace German -} // End of namespace Titanic - -#endif /* TITANIC_DOORBOT_SCRIPT_DE_H */ diff --git a/engines/titanic/true_talk/german/liftbot_script.cpp b/engines/titanic/true_talk/german/liftbot_script.cpp deleted file mode 100644 index fade9968c4..0000000000 --- a/engines/titanic/true_talk/german/liftbot_script.cpp +++ /dev/null @@ -1,29 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#include "titanic/true_talk/german/liftbot_script.h" - -namespace Titanic { -namespace German { - -} // End of namespace German -} // End of namespace Titanic diff --git a/engines/titanic/true_talk/german/liftbot_script.h b/engines/titanic/true_talk/german/liftbot_script.h deleted file mode 100644 index 650a45201d..0000000000 --- a/engines/titanic/true_talk/german/liftbot_script.h +++ /dev/null @@ -1,41 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#ifndef TITANIC_LIFTBOT_SCRIPT_DE_H -#define TITANIC_LIFTBOT_SCRIPT_DE_H - -#include "titanic/true_talk/liftbot_script.h" - -namespace Titanic { -namespace German { - -class LiftbotScript : public ::Titanic::LiftbotScript { -public: - LiftbotScript(int val1, const char *charClass, int v2, - const char *charName, int v3, int val2, int v4, int v5, int v6, int v7) : - ::Titanic::LiftbotScript(val1, charClass, v2, charName, v3, val2, v4, v5, v6, v7) {} -}; - -} // End of namespace German -} // End of namespace Titanic - -#endif /* TITANIC_LIFTBOT_SCRIPT_DE_H */ diff --git a/engines/titanic/true_talk/german/maitred_script.cpp b/engines/titanic/true_talk/german/maitred_script.cpp deleted file mode 100644 index f670cdf58b..0000000000 --- a/engines/titanic/true_talk/german/maitred_script.cpp +++ /dev/null @@ -1,29 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#include "titanic/true_talk/german/maitred_script.h" - -namespace Titanic { -namespace German { - -} // End of namespace German -} // End of namespace Titanic diff --git a/engines/titanic/true_talk/german/maitred_script.h b/engines/titanic/true_talk/german/maitred_script.h deleted file mode 100644 index 2bd2ce8e14..0000000000 --- a/engines/titanic/true_talk/german/maitred_script.h +++ /dev/null @@ -1,41 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#ifndef TITANIC_MAITRED_SCRIPT_DE_H -#define TITANIC_MAITRED_SCRIPT_DE_H - -#include "titanic/true_talk/maitred_script.h" - -namespace Titanic { -namespace German { - -class MaitreDScript : public ::Titanic::MaitreDScript { -public: - MaitreDScript(int val1, const char *charClass, int v2, - const char *charName, int v3, int val2) : - ::Titanic::MaitreDScript(val1, charClass, v2, charName, v3, val2) {} -}; - -} // End of namespace German -} // End of namespace Titanic - -#endif /* TITANIC_MAITRED_SCRIPT_DE_H */ diff --git a/engines/titanic/true_talk/german/parrot_script.cpp b/engines/titanic/true_talk/german/parrot_script.cpp deleted file mode 100644 index 3e241c8683..0000000000 --- a/engines/titanic/true_talk/german/parrot_script.cpp +++ /dev/null @@ -1,29 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#include "titanic/true_talk/german/parrot_script.h" - -namespace Titanic { -namespace German { - -} // End of namespace German -} // End of namespace Titanic diff --git a/engines/titanic/true_talk/german/parrot_script.h b/engines/titanic/true_talk/german/parrot_script.h deleted file mode 100644 index b34e6b112f..0000000000 --- a/engines/titanic/true_talk/german/parrot_script.h +++ /dev/null @@ -1,41 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#ifndef TITANIC_PARROT_SCRIPT_DE_H -#define TITANIC_PARROT_SCRIPT_DE_H - -#include "titanic/true_talk/parrot_script.h" - -namespace Titanic { -namespace German { - -class ParrotScript : public ::Titanic::ParrotScript { -public: - ParrotScript(int val1, const char *charClass, int v2, - const char *charName, int v3, int val2, int v4, int v5, int v6, int v7) : - ::Titanic::ParrotScript(val1, charClass, v2, charName, v3, val2, v4, v5, v6, v7) {} -}; - -} // End of namespace German -} // End of namespace Titanic - -#endif /* TITANIC_PARROT_SCRIPT_DE_H */ diff --git a/engines/titanic/true_talk/german/succubus_script.cpp b/engines/titanic/true_talk/german/succubus_script.cpp deleted file mode 100644 index a4963a8a59..0000000000 --- a/engines/titanic/true_talk/german/succubus_script.cpp +++ /dev/null @@ -1,29 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#include "titanic/true_talk/german/succubus_script.h" - -namespace Titanic { -namespace German { - -} // End of namespace German -} // End of namespace Titanic diff --git a/engines/titanic/true_talk/german/succubus_script.h b/engines/titanic/true_talk/german/succubus_script.h deleted file mode 100644 index f9ad25c36e..0000000000 --- a/engines/titanic/true_talk/german/succubus_script.h +++ /dev/null @@ -1,41 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#ifndef TITANIC_SUCCUBUS_SCRIPT_DE_H -#define TITANIC_SUCCUBUS_SCRIPT_DE_H - -#include "titanic/true_talk/succubus_script.h" - -namespace Titanic { -namespace German { - -class SuccUBusScript : public ::Titanic::SuccUBusScript { -public: - SuccUBusScript(int val1, const char *charClass, int v2, - const char *charName, int v3, int val2, int v4, int v5, int v6, int v7) : - ::Titanic::SuccUBusScript(val1, charClass, v2, charName, v3, val2, v4, v5, v6, v7) {} -}; - -} // End of namespace German -} // End of namespace Titanic - -#endif /* TITANIC_SUCCUBUS_SCRIPT_DE_H */ diff --git a/engines/titanic/true_talk/tt_scripts.cpp b/engines/titanic/true_talk/tt_scripts.cpp index 4c103ed457..bda6e672bd 100644 --- a/engines/titanic/true_talk/tt_scripts.cpp +++ b/engines/titanic/true_talk/tt_scripts.cpp @@ -30,14 +30,6 @@ #include "titanic/true_talk/maitred_script.h" #include "titanic/true_talk/parrot_script.h" #include "titanic/true_talk/succubus_script.h" -#include "titanic/true_talk/german/barbot_script.h" -#include "titanic/true_talk/german/bellbot_script.h" -#include "titanic/true_talk/german/deskbot_script.h" -#include "titanic/true_talk/german/doorbot_script.h" -#include "titanic/true_talk/german/liftbot_script.h" -#include "titanic/true_talk/german/maitred_script.h" -#include "titanic/true_talk/german/parrot_script.h" -#include "titanic/true_talk/german/succubus_script.h" #include "titanic/translation.h" namespace Titanic { @@ -72,25 +64,14 @@ TTscripts::TTscripts() { addScript(new TTroomScript(scriptNum)); // Load npc scripts - if (g_language == Common::DE_DEU) { - addScript(new German::BarbotScript(100, "Barbot", 0, "Fortillian", 9, 1, -1, -1, -1, 0), 112); - addScript(new German::BellbotScript(101, "Bellbot", 0, "Krage", 8, 1), 110); - addScript(new German::DeskbotScript(103, "DeskBot", 0, "Marsinta", 11, 2), 110); - addScript(new German::DoorbotScript(104, "Doorbot", 0, "Fentible", 11, 1, -1, -1, -1, 0), 100); - addScript(new German::LiftbotScript(105, "LiftBot", 0, "Nobby", 11, 1, -1, -1, -1, 0), 103); - addScript(new German::ParrotScript(107, "Parrot", 0, "The Parrot", 5, 1, -1, -1, -1, 0), 111); - addScript(new German::SuccUBusScript(111, "Succubus", 0, "Shorbert", 9, 1, -1, -1, -1, 0), 110); - addScript(new German::MaitreDScript(112, "MaitreDBot", 0, "Dastrogaaar", 8, 1), 132); - } else { - addScript(new BarbotScript(100, "Barbot", 0, "Fortillian", 9, 1, -1, -1, -1, 0), 112); - addScript(new BellbotScript(101, "Bellbot", 0, "Krage", 8, 1), 110); - addScript(new DeskbotScript(103, "DeskBot", 0, "Marsinta", 11, 2), 110); - addScript(new DoorbotScript(104, "Doorbot", 0, "Fentible", 11, 1, -1, -1, -1, 0), 100); - addScript(new LiftbotScript(105, "LiftBot", 0, "Nobby", 11, 1, -1, -1, -1, 0), 103); - addScript(new ParrotScript(107, "Parrot", 0, "The Parrot", 5, 1, -1, -1, -1, 0), 111); - addScript(new SuccUBusScript(111, "Succubus", 0, "Shorbert", 9, 1, -1, -1, -1, 0), 110); - addScript(new MaitreDScript(112, "MaitreDBot", 0, "Dastrogaaar", 8, 1), 132); - } + addScript(new BarbotScript(100, "Barbot", 0, "Fortillian", 9, 1, -1, -1, -1, 0), 112); + addScript(new BellbotScript(101, "Bellbot", 0, "Krage", 8, 1), 110); + addScript(new DeskbotScript(103, "DeskBot", 0, "Marsinta", 11, 2), 110); + addScript(new DoorbotScript(104, "Doorbot", 0, "Fentible", 11, 1, -1, -1, -1, 0), 100); + addScript(new LiftbotScript(105, "LiftBot", 0, "Nobby", 11, 1, -1, -1, -1, 0), 103); + addScript(new ParrotScript(107, "Parrot", 0, "The Parrot", 5, 1, -1, -1, -1, 0), 111); + addScript(new SuccUBusScript(111, "Succubus", 0, "Shorbert", 9, 1, -1, -1, -1, 0), 110); + addScript(new MaitreDScript(112, "MaitreDBot", 0, "Dastrogaaar", 8, 1), 132); } void TTscripts::addScript(TTnpcScript *script, int scriptId) { |