aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2016-07-24 20:56:58 -0400
committerPaul Gilbert2016-07-24 20:56:58 -0400
commit13ce0156ff16cddbdfe108b92fbcf83a28c090e7 (patch)
tree5c0b0a417ba60b462a3e775511b76ef7097aa43e
parent875002daea7a007c2727685a767eaaf3709a5252 (diff)
downloadscummvm-rg350-13ce0156ff16cddbdfe108b92fbcf83a28c090e7.tar.gz
scummvm-rg350-13ce0156ff16cddbdfe108b92fbcf83a28c090e7.tar.bz2
scummvm-rg350-13ce0156ff16cddbdfe108b92fbcf83a28c090e7.zip
TITANIC: Fix crash loading Sentences/Default NPC data
-rw-r--r--engines/titanic/titanic.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/titanic/titanic.cpp b/engines/titanic/titanic.cpp
index 66d4e46546..6b23a2595d 100644
--- a/engines/titanic/titanic.cpp
+++ b/engines/titanic/titanic.cpp
@@ -82,6 +82,9 @@ void TitanicEngine::initialize() {
DebugMan.addDebugChannel(kDebugGraphics, "graphics", "Graphics handling");
DebugMan.addDebugChannel(kDebugSound, "sound", "Sound and Music handling");
+ _debugger = new Debugger(this);
+ _filesManager = new CFilesManager();
+
CSaveableObject::initClassList();
CEnterExitFirstClassState::init();
CGameObject::init();
@@ -97,9 +100,7 @@ void TitanicEngine::initialize() {
TTnpcScript::init();
OSVideoSurface::setup();
- _debugger = new Debugger(this);
_events = new Events(this);
- _filesManager = new CFilesManager();
_screen = new Graphics::Screen(0, 0);
_screenManager = new OSScreenManager(this);
_window = new CMainGameWindow(this);