diff options
author | Paul Gilbert | 2016-06-04 23:27:14 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-07-15 19:19:56 -0400 |
commit | 6c4eff4dfcb883df81d415bb57377da7bf239cc1 (patch) | |
tree | fda25e50e4d9dc9fc640e065e351d45ab67e7554 /engines/titanic | |
parent | 764cfcb6d6ccad3046c9d96788b3edd5857f1c79 (diff) | |
download | scummvm-rg350-6c4eff4dfcb883df81d415bb57377da7bf239cc1.tar.gz scummvm-rg350-6c4eff4dfcb883df81d415bb57377da7bf239cc1.tar.bz2 scummvm-rg350-6c4eff4dfcb883df81d415bb57377da7bf239cc1.zip |
TITANIC: Fix loading of JRQUOTES
Diffstat (limited to 'engines/titanic')
-rw-r--r-- | engines/titanic/pet_control/pet_inventory_glyphs.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/true_talk/true_talk_manager.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/true_talk/tt_quotes.cpp | 6 | ||||
-rw-r--r-- | engines/titanic/true_talk/tt_quotes.h | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/engines/titanic/pet_control/pet_inventory_glyphs.cpp b/engines/titanic/pet_control/pet_inventory_glyphs.cpp index 6ce130f22d..b793c1af13 100644 --- a/engines/titanic/pet_control/pet_inventory_glyphs.cpp +++ b/engines/titanic/pet_control/pet_inventory_glyphs.cpp @@ -111,8 +111,10 @@ int CPetInventoryGlyph::populateItem(CGameObject *item, int val) { break; default: - return ITEM_MODES[itemIndex]; + break; } + + return ITEM_MODES[itemIndex]; } int CPetInventoryGlyph::subMode(CGameObject *item, int val) { diff --git a/engines/titanic/true_talk/true_talk_manager.cpp b/engines/titanic/true_talk/true_talk_manager.cpp index a5a1edcc37..555d0e6a1b 100644 --- a/engines/titanic/true_talk/true_talk_manager.cpp +++ b/engines/titanic/true_talk/true_talk_manager.cpp @@ -49,7 +49,7 @@ CTrueTalkManager::CTrueTalkManager(CGameManager *owner) : _gameManager(owner), _scripts(&_titleEngine), _currentCharId(0), _dialogueFile(nullptr), _dialogueId(0) { _titleEngine.setup(3, 3); - _quotes.load("TEXT/JRQuotes.txt"); + _quotes.load("TEXT/JRQUOTES.TXT"); _currentNPC = nullptr; g_vm->_trueTalkManager = this; } diff --git a/engines/titanic/true_talk/tt_quotes.cpp b/engines/titanic/true_talk/tt_quotes.cpp index 7b98558d63..8e9978bbb9 100644 --- a/engines/titanic/true_talk/tt_quotes.cpp +++ b/engines/titanic/true_talk/tt_quotes.cpp @@ -27,7 +27,7 @@ namespace Titanic { TTquotes::TTquotes() { - Common::fill(&_array[0], &_array[256], 0); + Common::fill(&_tags[0], &_tags[256], 0); _dataP = nullptr; _dataSize = 0; _field544 = 0; @@ -38,14 +38,14 @@ TTquotes::~TTquotes() { } void TTquotes::load(const CString &name) { - Common::SeekableReadStream *r = g_vm->_filesManager->getResource("TEXT/JRQuotes.txt"); + Common::SeekableReadStream *r = g_vm->_filesManager->getResource(name); size_t size = r->readUint32LE(); _dataSize = _field544 = size; _dataP = new char[size + 0x10]; for (int idx = 0; idx < 256; ++idx) - _array[idx] = r->readUint32LE(); + _tags[idx] = r->readUint32LE(); for (int charIdx = 0; charIdx < 26; ++charIdx) { TTquotesLetter &letter = _alphabet[charIdx]; diff --git a/engines/titanic/true_talk/tt_quotes.h b/engines/titanic/true_talk/tt_quotes.h index 4e7d0d3eb6..db105265ee 100644 --- a/engines/titanic/true_talk/tt_quotes.h +++ b/engines/titanic/true_talk/tt_quotes.h @@ -44,7 +44,7 @@ class TTquotes { }; private: TTquotesLetter _alphabet[26]; - uint _array[256]; + uint _tags[256]; char *_dataP; size_t _dataSize; int _field544; |