aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/true_talk
diff options
context:
space:
mode:
authorPaul Gilbert2017-01-15 09:29:04 -0500
committerPaul Gilbert2017-01-15 09:29:04 -0500
commit9d6af45877da86a55d9398f8233213f4d48191fe (patch)
tree73eb5e474c095abc3b0710ff66e723b6d04b6a57 /engines/titanic/true_talk
parent8a061ee82dea18a351a8905f8f4d2322d4bb8828 (diff)
downloadscummvm-rg350-9d6af45877da86a55d9398f8233213f4d48191fe.tar.gz
scummvm-rg350-9d6af45877da86a55d9398f8233213f4d48191fe.tar.bz2
scummvm-rg350-9d6af45877da86a55d9398f8233213f4d48191fe.zip
TITANIC: Removal of un-used fields to reduce Buildbot warnings
Note there's a lot of preliminary code in the star_control/ folder for code that still needs to be fully disassembled & implemented. So for now I've made liberal use of #if 0 blocks to disable fields that will likely be needed again in the future
Diffstat (limited to 'engines/titanic/true_talk')
-rw-r--r--engines/titanic/true_talk/script_handler.cpp3
-rw-r--r--engines/titanic/true_talk/script_handler.h1
-rw-r--r--engines/titanic/true_talk/true_talk_manager.cpp2
-rw-r--r--engines/titanic/true_talk/tt_scripts.cpp3
-rw-r--r--engines/titanic/true_talk/tt_scripts.h5
5 files changed, 4 insertions, 10 deletions
diff --git a/engines/titanic/true_talk/script_handler.cpp b/engines/titanic/true_talk/script_handler.cpp
index 802e2b4ba6..be0b89bc65 100644
--- a/engines/titanic/true_talk/script_handler.cpp
+++ b/engines/titanic/true_talk/script_handler.cpp
@@ -32,8 +32,7 @@ namespace Titanic {
/*------------------------------------------------------------------------*/
CScriptHandler::CScriptHandler(CTitleEngine *owner, int val1, int val2) :
- _owner(owner), _script(owner->_script), _resources(g_vm->_exeResources),
- _parser(this), _inputCtr(0), _concept1P(nullptr),
+ _owner(owner), _script(owner->_script), _parser(this), _inputCtr(0), _concept1P(nullptr),
_concept2P(nullptr), _concept3P(nullptr), _concept4P(nullptr) {
g_vm->_scriptHandler = this;
g_vm->_script = _script;
diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h
index e28eeed1ac..85d5e2e437 100644
--- a/engines/titanic/true_talk/script_handler.h
+++ b/engines/titanic/true_talk/script_handler.h
@@ -38,7 +38,6 @@ class CScriptHandler;
class CScriptHandler {
private:
CTitleEngine *_owner;
- CExeResources &_resources;
int _inputCtr;
private:
void handleWord1(const TTstring *str);
diff --git a/engines/titanic/true_talk/true_talk_manager.cpp b/engines/titanic/true_talk/true_talk_manager.cpp
index 446a32eaae..f8efe91466 100644
--- a/engines/titanic/true_talk/true_talk_manager.cpp
+++ b/engines/titanic/true_talk/true_talk_manager.cpp
@@ -46,7 +46,7 @@ CTrueTalkNPC *CTrueTalkManager::_currentNPC;
/*------------------------------------------------------------------------*/
CTrueTalkManager::CTrueTalkManager(CGameManager *owner) :
- _gameManager(owner), _scripts(&_titleEngine), _currentCharId(0),
+ _gameManager(owner), _scripts(), _currentCharId(0),
_dialogueFile(nullptr), _dialogueId(0) {
_titleEngine.setup(3, 3);
_quotes.load();
diff --git a/engines/titanic/true_talk/tt_scripts.cpp b/engines/titanic/true_talk/tt_scripts.cpp
index 4c01fd1ead..b1f18771fe 100644
--- a/engines/titanic/true_talk/tt_scripts.cpp
+++ b/engines/titanic/true_talk/tt_scripts.cpp
@@ -57,8 +57,7 @@ TTroomScript *TTroomScriptList::findById(uint scriptId) const {
/*------------------------------------------------------------------------*/
-TTscripts::TTscripts(CTitleEngine *titleEngine) :
- _titleEngine(titleEngine), _field24(0), _field28(0) {
+TTscripts::TTscripts() {
// Load room scripts
for (int scriptNum = 100; scriptNum < 133; ++scriptNum)
addScript(new TTroomScript(scriptNum));
diff --git a/engines/titanic/true_talk/tt_scripts.h b/engines/titanic/true_talk/tt_scripts.h
index 734d86256f..dfc8d4a9d5 100644
--- a/engines/titanic/true_talk/tt_scripts.h
+++ b/engines/titanic/true_talk/tt_scripts.h
@@ -58,9 +58,6 @@ class TTscripts {
private:
TTnpcScriptList _npcScripts;
TTroomScriptList _roomScripts;
- CTitleEngine *_titleEngine;
- int _field24;
- int _field28;
private:
/**
* Add a named script to the named scripts list
@@ -72,7 +69,7 @@ private:
*/
void addScript(TTroomScript *script);
public:
- TTscripts(CTitleEngine *titleEngine);
+ TTscripts();
/**
* Return a pointer to the specified room script