diff options
Diffstat (limited to 'engines/titanic/titanic.cpp')
| -rw-r--r-- | engines/titanic/titanic.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/engines/titanic/titanic.cpp b/engines/titanic/titanic.cpp index 2566a36d7c..29730c36c8 100644 --- a/engines/titanic/titanic.cpp +++ b/engines/titanic/titanic.cpp @@ -60,6 +60,12 @@ TitanicEngine::TitanicEngine(OSystem *syst, const TitanicGameDescription *gameDe _scriptHandler = nullptr; _script = nullptr; CMusicRoom::_musicHandler = nullptr; + + // Set up debug channels + DebugMan.addDebugChannel(kDebugCore, "core", "Core engine debug level"); + DebugMan.addDebugChannel(kDebugScripts, "scripts", "Game scripts"); + DebugMan.addDebugChannel(kDebugGraphics, "graphics", "Graphics handling"); + DebugMan.addDebugChannel(kDebugSound, "sound", "Sound and Music handling"); } TitanicEngine::~TitanicEngine() { @@ -78,12 +84,6 @@ void TitanicEngine::initializePath(const Common::FSNode &gamePath) { } void TitanicEngine::initialize() { - // Set up debug channels - DebugMan.addDebugChannel(kDebugCore, "core", "Core engine debug level"); - DebugMan.addDebugChannel(kDebugScripts, "scripts", "Game scripts"); - DebugMan.addDebugChannel(kDebugGraphics, "graphics", "Graphics handling"); - DebugMan.addDebugChannel(kDebugSound, "sound", "Sound and Music handling"); - _debugger = new Debugger(this); _filesManager = new CFilesManager(this); @@ -107,6 +107,7 @@ void TitanicEngine::initialize() { _screen = new Graphics::Screen(0, 0); _screenManager = new OSScreenManager(this); _window = new CMainGameWindow(this); + _strings.load(); setItemNames(); setRoomNames(); @@ -149,7 +150,7 @@ void TitanicEngine::setItemNames() { r = g_vm->_filesManager->getResource("TEXT/ITEM_DESCRIPTIONS"); while (r->pos() < r->size()) - _itemNames.push_back(readStringFromStream(r)); + _itemDescriptions.push_back(readStringFromStream(r)); delete r; r = g_vm->_filesManager->getResource("TEXT/ITEM_IDS"); |