aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic
diff options
context:
space:
mode:
authorPaul Gilbert2016-05-12 21:35:28 -0400
committerPaul Gilbert2016-07-10 16:39:26 -0400
commite8971dd106fa28fe1d4ef8e00ee34ec623a746c9 (patch)
tree1fc080241edfe02c1c7adf28b265531b45ef1f30 /engines/titanic
parent06876335cd027529b3719cdfc6d255b00a592b02 (diff)
downloadscummvm-rg350-e8971dd106fa28fe1d4ef8e00ee34ec623a746c9.tar.gz
scummvm-rg350-e8971dd106fa28fe1d4ef8e00ee34ec623a746c9.tar.bz2
scummvm-rg350-e8971dd106fa28fe1d4ef8e00ee34ec623a746c9.zip
TITANIC: Rename CScriptHandlerSub2 to TTparser
Diffstat (limited to 'engines/titanic')
-rw-r--r--engines/titanic/module.mk1
-rw-r--r--engines/titanic/true_talk/script_handler.cpp2
-rw-r--r--engines/titanic/true_talk/script_handler.h17
-rw-r--r--engines/titanic/true_talk/tt_parser.cpp28
-rw-r--r--engines/titanic/true_talk/tt_parser.h46
5 files changed, 78 insertions, 16 deletions
diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk
index cac64a57c2..51ebdbbebd 100644
--- a/engines/titanic/module.mk
+++ b/engines/titanic/module.mk
@@ -463,6 +463,7 @@ MODULE_OBJS := \
true_talk/tt_script_base.o \
true_talk/tt_room_script.o \
true_talk/tt_npc_script.o \
+ true_talk/tt_parser.o \
true_talk/tt_scripts.o \
true_talk/tt_string.o \
true_talk/tt_string_node.o \
diff --git a/engines/titanic/true_talk/script_handler.cpp b/engines/titanic/true_talk/script_handler.cpp
index d050c0492e..65ec60039c 100644
--- a/engines/titanic/true_talk/script_handler.cpp
+++ b/engines/titanic/true_talk/script_handler.cpp
@@ -29,7 +29,7 @@ namespace Titanic {
CScriptHandler::CScriptHandler(CTitleEngine *owner, int val1, int val2) :
_owner(owner), _script(owner->_script), _resources(g_vm->_exeResources),
- _sub1(), _sub2(this), _field10(0), _inputCtr(0),
+ _sub1(), _parser(this), _field10(0), _inputCtr(0),
_field20(0), _field24(0), _field28(0), _field2C(0), _field30(0) {
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 73ddb7bee4..7692959e71 100644
--- a/engines/titanic/true_talk/script_handler.h
+++ b/engines/titanic/true_talk/script_handler.h
@@ -24,6 +24,7 @@
#define TITANIC_SCRIPT_HANDLER_H
#include "titanic/true_talk/tt_npc_script.h"
+#include "titanic/true_talk/tt_parser.h"
#include "titanic/true_talk/tt_room_script.h"
#include "titanic/true_talk/tt_string.h"
#include "titanic/true_talk/tt_vocab.h"
@@ -46,20 +47,6 @@ public:
_fieldC(0), _field10(0) {}
};
-class CScriptHandlerSub2 {
-public:
- CScriptHandler *_owner;
- int _field4;
- int _field8;
- int _fieldC;
- int _field10;
- int _field14;
- int _field18;
-public:
- CScriptHandlerSub2(CScriptHandler *owner) : _owner(owner), _field4(0), _field8(0),
- _fieldC(0), _field10(0), _field14(0), _field18(0) {}
-};
-
class CScriptHandler {
private:
CTitleEngine *_owner;
@@ -68,7 +55,7 @@ private:
CExeResources &_resources;
int _field10;
CScriptHandlerSub1 _sub1;
- CScriptHandlerSub2 _sub2;
+ TTparser _parser;
int _inputCtr;
int _field20;
int _field24;
diff --git a/engines/titanic/true_talk/tt_parser.cpp b/engines/titanic/true_talk/tt_parser.cpp
new file mode 100644
index 0000000000..ad40cbcad4
--- /dev/null
+++ b/engines/titanic/true_talk/tt_parser.cpp
@@ -0,0 +1,28 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "titanic/true_talk/tt_parser.h"
+#include "titanic/true_talk/script_handler.h"
+
+namespace Titanic {
+
+} // End of namespace Titanic
diff --git a/engines/titanic/true_talk/tt_parser.h b/engines/titanic/true_talk/tt_parser.h
new file mode 100644
index 0000000000..767406adb1
--- /dev/null
+++ b/engines/titanic/true_talk/tt_parser.h
@@ -0,0 +1,46 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef TITANIC_TT_PARSER_H
+#define TITANIC_TT_PARSER_H
+
+namespace Titanic {
+
+class CScriptHandler;
+
+class TTparser {
+public:
+ CScriptHandler *_owner;
+ int _field4;
+ int _field8;
+ int _fieldC;
+ int _field10;
+ int _field14;
+ int _field18;
+public:
+ TTparser(CScriptHandler *owner) : _owner(owner), _field4(0), _field8(0),
+ _fieldC(0), _field10(0), _field14(0), _field18(0) {}
+};
+
+} // End of namespace Titanic
+
+#endif /* TITANIC_TT_PARSER_H */