diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/titanic/module.mk | 2 | ||||
-rw-r--r-- | engines/titanic/true_talk/script_handler.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/true_talk/script_handler.h | 4 | ||||
-rw-r--r-- | engines/titanic/true_talk/tt_vocab.cpp (renamed from engines/titanic/true_talk/st_vocab.cpp) | 12 | ||||
-rw-r--r-- | engines/titanic/true_talk/tt_vocab.h (renamed from engines/titanic/true_talk/st_vocab.h) | 6 |
5 files changed, 13 insertions, 13 deletions
diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk index 47da6d4230..cac64a57c2 100644 --- a/engines/titanic/module.mk +++ b/engines/titanic/module.mk @@ -459,7 +459,6 @@ MODULE_OBJS := \ true_talk/succubus_script.o \ true_talk/title_engine.o \ true_talk/script_handler.o \ - true_talk/st_vocab.o \ true_talk/true_talk_manager.o \ true_talk/tt_script_base.o \ true_talk/tt_room_script.o \ @@ -470,6 +469,7 @@ MODULE_OBJS := \ true_talk/tt_synonym.o \ true_talk/tt_talker.o \ true_talk/tt_title_script.o \ + true_talk/tt_vocab.o \ true_talk/tt_word.o # This module can be built as a plugin diff --git a/engines/titanic/true_talk/script_handler.cpp b/engines/titanic/true_talk/script_handler.cpp index d19c08aa0e..d050c0492e 100644 --- a/engines/titanic/true_talk/script_handler.cpp +++ b/engines/titanic/true_talk/script_handler.cpp @@ -34,7 +34,7 @@ CScriptHandler::CScriptHandler(CTitleEngine *owner, int val1, int val2) : g_vm->_scriptHandler = this; g_vm->_script = _script; g_vm->_exeResources.reset(this, val1, val2); - _vocab = new STVocab(val2); + _vocab = new TTvocab(val2); } CScriptHandler::~CScriptHandler() { diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h index 8449a72282..80532a7dda 100644 --- a/engines/titanic/true_talk/script_handler.h +++ b/engines/titanic/true_talk/script_handler.h @@ -26,7 +26,7 @@ #include "titanic/true_talk/tt_npc_script.h" #include "titanic/true_talk/tt_room_script.h" #include "titanic/true_talk/tt_string.h" -#include "titanic/true_talk/st_vocab.h" +#include "titanic/true_talk/tt_vocab.h" #include "titanic/support/exe_resources.h" namespace Titanic { @@ -64,7 +64,7 @@ class CScriptHandler { private: CTitleEngine *_owner; TTScriptBase *_script; - STVocab *_vocab; + TTvocab *_vocab; CExeResources &_resources; int _field10; CScriptHandlerSub1 _sub1; diff --git a/engines/titanic/true_talk/st_vocab.cpp b/engines/titanic/true_talk/tt_vocab.cpp index 8ea2b53871..1bfd3dfde3 100644 --- a/engines/titanic/true_talk/st_vocab.cpp +++ b/engines/titanic/true_talk/tt_vocab.cpp @@ -21,17 +21,17 @@ */ #include "common/file.h" -#include "titanic/true_talk/st_vocab.h" +#include "titanic/true_talk/tt_vocab.h" #include "titanic/titanic.h" namespace Titanic { -STVocab::STVocab(int val): _pHead(nullptr), _pTail(nullptr), _word(nullptr), +TTvocab::TTvocab(int val): _pHead(nullptr), _pTail(nullptr), _word(nullptr), _fieldC(0), _field10(0), _field18(val) { _field14 = load("STVOCAB.TXT"); } -STVocab::~STVocab() { +TTvocab::~TTvocab() { if (_pHead) { _pHead->deleteSiblings(); delete _pHead; @@ -39,7 +39,7 @@ STVocab::~STVocab() { } } -int STVocab::load(const CString &name) { +int TTvocab::load(const CString &name) { SimpleFile *file = g_vm->_exeResources._owner->openResource(name); int result = 0; bool skipFlag; @@ -124,7 +124,7 @@ int STVocab::load(const CString &name) { return result; } -void STVocab::addWord(TTword *word) { +void TTvocab::addWord(TTword *word) { TTword *existingWord = findWord(word->_string); if (existingWord) { @@ -148,7 +148,7 @@ void STVocab::addWord(TTword *word) { } } -TTword *STVocab::findWord(const TTString &str) { +TTword *TTvocab::findWord(const TTString &str) { TTsynonym *tempNode = new TTsynonym(); bool flag = false; TTword *word = _pHead; diff --git a/engines/titanic/true_talk/st_vocab.h b/engines/titanic/true_talk/tt_vocab.h index 6a86825ef7..d4dbda0029 100644 --- a/engines/titanic/true_talk/st_vocab.h +++ b/engines/titanic/true_talk/tt_vocab.h @@ -29,7 +29,7 @@ namespace Titanic { -class STVocab { +class TTvocab { private: TTword *_pHead; TTword *_pTail; @@ -54,8 +54,8 @@ private: */ TTword *findWord(const TTString &str); public: - STVocab(int val); - ~STVocab(); + TTvocab(int val); + ~TTvocab(); }; } // End of namespace Titanic |