diff options
author | Paul Gilbert | 2016-05-11 21:17:28 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-07-10 16:39:19 -0400 |
commit | 7700923298da4002a5d0baf28913a46e7e0fcf59 (patch) | |
tree | 2c40cf0ca153f6694675d9a524a3ad358d6faf7c /engines | |
parent | 01320c06cbb6a25ee226c1037152d5348b73cd68 (diff) | |
download | scummvm-rg350-7700923298da4002a5d0baf28913a46e7e0fcf59.tar.gz scummvm-rg350-7700923298da4002a5d0baf28913a46e7e0fcf59.tar.bz2 scummvm-rg350-7700923298da4002a5d0baf28913a46e7e0fcf59.zip |
TITANIC: Change CFileReader to CExeResoucres
Diffstat (limited to 'engines')
-rw-r--r-- | engines/titanic/module.mk | 2 | ||||
-rw-r--r-- | engines/titanic/support/exe_resources.cpp (renamed from engines/titanic/support/file_reader.cpp) | 6 | ||||
-rw-r--r-- | engines/titanic/support/exe_resources.h (renamed from engines/titanic/support/file_reader.h) | 10 | ||||
-rw-r--r-- | engines/titanic/titanic.h | 4 | ||||
-rw-r--r-- | engines/titanic/true_talk/script_handler.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/true_talk/script_handler.h | 4 | ||||
-rw-r--r-- | engines/titanic/true_talk/st_vocab.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/true_talk/tt_word.cpp | 2 |
8 files changed, 17 insertions, 17 deletions
diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk index 42103e77da..47da6d4230 100644 --- a/engines/titanic/module.mk +++ b/engines/titanic/module.mk @@ -431,7 +431,7 @@ MODULE_OBJS := \ star_control/star_control_sub15.o \ support/direct_draw.o \ support/direct_draw_surface.o \ - support/file_reader.o \ + support/exe_resources.o \ support/files_manager.o \ support/font.o \ support/image.o \ diff --git a/engines/titanic/support/file_reader.cpp b/engines/titanic/support/exe_resources.cpp index f31d72bda5..91139dce3d 100644 --- a/engines/titanic/support/file_reader.cpp +++ b/engines/titanic/support/exe_resources.cpp @@ -20,15 +20,15 @@ * */ -#include "titanic/support/file_reader.h" +#include "titanic/support/exe_resources.h" namespace Titanic { -CFileReader::CFileReader() : _owner(nullptr), _field4(0), _field8(0), +CExeResources::CExeResources() : _owner(nullptr), _field4(0), _field8(0), _fieldC(0), _field10(0), _field14(0), _field18(0) { } -void CFileReader::reset(CScriptHandler *owner, int val1, int val2) { +void CExeResources::reset(CScriptHandler *owner, int val1, int val2) { _owner = owner; _field18 = val2; } diff --git a/engines/titanic/support/file_reader.h b/engines/titanic/support/exe_resources.h index 42ab43c294..48b48d4933 100644 --- a/engines/titanic/support/file_reader.h +++ b/engines/titanic/support/exe_resources.h @@ -20,8 +20,8 @@ * */ -#ifndef TITANIC_FILE_READER_H -#define TITANIC_FILE_READER_H +#ifndef TITANIC_EXE_RESOURCES_H +#define TITANIC_EXE_RESOURCES_H #include "common/file.h" @@ -29,7 +29,7 @@ namespace Titanic { class CScriptHandler; -class CFileReader { +class CExeResources { public: CScriptHandler *_owner; int _field4; @@ -39,7 +39,7 @@ public: int _field14; int _field18; public: - CFileReader(); + CExeResources(); void reset(CScriptHandler *owner, int val1, int val2); @@ -48,4 +48,4 @@ public: } // End of namespace Titanic -#endif /* TITANIC_FILE_READER_H */ +#endif /* TITANIC_EXE_RESOURCES_H */ diff --git a/engines/titanic/titanic.h b/engines/titanic/titanic.h index 71e8fcdf2c..78f19c5ba1 100644 --- a/engines/titanic/titanic.h +++ b/engines/titanic/titanic.h @@ -34,7 +34,7 @@ #include "titanic/events.h" #include "titanic/support/files_manager.h" #include "titanic/main_game_window.h" -#include "titanic/support/file_reader.h" +#include "titanic/support/exe_resources.h" #include "titanic/support/movie.h" #include "titanic/support/screen_manager.h" #include "titanic/support/string.h" @@ -120,7 +120,7 @@ public: Common::RandomSource _randomSource; CScriptHandler *_scriptHandler; TTScriptBase *_script; - CFileReader _fileReader; + CExeResources _exeResources; CMovieList _activeMovies; CString _itemNames[TOTAL_ITEMS]; CString _itemDescriptions[TOTAL_ITEMS]; diff --git a/engines/titanic/true_talk/script_handler.cpp b/engines/titanic/true_talk/script_handler.cpp index 67ce8be61f..d19c08aa0e 100644 --- a/engines/titanic/true_talk/script_handler.cpp +++ b/engines/titanic/true_talk/script_handler.cpp @@ -28,12 +28,12 @@ namespace Titanic { /*------------------------------------------------------------------------*/ CScriptHandler::CScriptHandler(CTitleEngine *owner, int val1, int val2) : - _owner(owner), _script(owner->_script), _reader(g_vm->_fileReader), + _owner(owner), _script(owner->_script), _resources(g_vm->_exeResources), _sub1(), _sub2(this), _field10(0), _inputCtr(0), _field20(0), _field24(0), _field28(0), _field2C(0), _field30(0) { g_vm->_scriptHandler = this; g_vm->_script = _script; - g_vm->_fileReader.reset(this, val1, val2); + g_vm->_exeResources.reset(this, val1, val2); _vocab = new STVocab(val2); } diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h index 58d58d6d27..8449a72282 100644 --- a/engines/titanic/true_talk/script_handler.h +++ b/engines/titanic/true_talk/script_handler.h @@ -27,7 +27,7 @@ #include "titanic/true_talk/tt_room_script.h" #include "titanic/true_talk/tt_string.h" #include "titanic/true_talk/st_vocab.h" -#include "titanic/support/file_reader.h" +#include "titanic/support/exe_resources.h" namespace Titanic { @@ -65,7 +65,7 @@ private: CTitleEngine *_owner; TTScriptBase *_script; STVocab *_vocab; - CFileReader &_reader; + CExeResources &_resources; int _field10; CScriptHandlerSub1 _sub1; CScriptHandlerSub2 _sub2; diff --git a/engines/titanic/true_talk/st_vocab.cpp b/engines/titanic/true_talk/st_vocab.cpp index 084393bf87..df683c7ad7 100644 --- a/engines/titanic/true_talk/st_vocab.cpp +++ b/engines/titanic/true_talk/st_vocab.cpp @@ -32,7 +32,7 @@ STVocab::STVocab(int val): _pHead(nullptr), _pTail(nullptr), _word(nullptr), } int STVocab::load(const CString &name) { - SimpleFile *file = g_vm->_fileReader._owner->openResource(name); + SimpleFile *file = g_vm->_exeResources._owner->openResource(name); int result = 0; bool skipFlag; diff --git a/engines/titanic/true_talk/tt_word.cpp b/engines/titanic/true_talk/tt_word.cpp index 143e1dfbd2..53d4bd8078 100644 --- a/engines/titanic/true_talk/tt_word.cpp +++ b/engines/titanic/true_talk/tt_word.cpp @@ -92,7 +92,7 @@ uint TTword::readNumber(const char *str) { } bool TTword::testFileHandle(SimpleFile *file) const { - if (g_vm->_fileReader.is18Equals(3)) + if (g_vm->_exeResources.is18Equals(3)) return true; // TODO: Figure out why original compares passed file handle against specific values |