From 3822d46341d111ccf29d0dbea4bd7223f546e51b Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Mon, 9 May 2016 19:39:19 -0400 Subject: TITANIC: FIx initializing file reader to read EXE resources --- engines/titanic/true_talk/st_vocab.cpp | 2 +- engines/titanic/true_talk/title_engine.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/engines/titanic/true_talk/st_vocab.cpp b/engines/titanic/true_talk/st_vocab.cpp index 2a3beff3d6..ff45dff592 100644 --- a/engines/titanic/true_talk/st_vocab.cpp +++ b/engines/titanic/true_talk/st_vocab.cpp @@ -28,7 +28,7 @@ namespace Titanic { STVocab::STVocab(int val): _field0(0), _field4(0), _word(nullptr), _fieldC(0), _field10(0), _field18(val) { - _field14 = load("STvocab.txt"); + _field14 = load("STVOCAB.TXT"); } int STVocab::load(const CString &name) { diff --git a/engines/titanic/true_talk/title_engine.cpp b/engines/titanic/true_talk/title_engine.cpp index 24cc4216ee..d4462c5bcd 100644 --- a/engines/titanic/true_talk/title_engine.cpp +++ b/engines/titanic/true_talk/title_engine.cpp @@ -40,6 +40,7 @@ void CTitleEngine::setup(int val1, int val2) { /*------------------------------------------------------------------------*/ STtitleEngine::STtitleEngine(): CTitleEngine(), _field58(0) { + _resources.loadFromEXE("ST.exe"); } STtitleEngine::~STtitleEngine() { @@ -66,8 +67,9 @@ void STtitleEngine::dump(int val1, int val2) { SimpleFile *STtitleEngine::open(const CString &name) { Common::SeekableReadStream *stream = _resources.getResource( - Common::WinResourceID("Text"), name); - + Common::WinResourceID("TEXT"), name); + assert(stream); + SimpleFile *file = new SimpleFile(); file->open(stream); return file; -- cgit v1.2.3