aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2016-05-12 23:27:21 -0400
committerPaul Gilbert2016-07-10 16:39:28 -0400
commitd649157c5b1afae1ff6a9a565575c1eddcc880fa (patch)
tree6dffb3c84bc42909dd788a883d11671d3e2c6989
parente8971dd106fa28fe1d4ef8e00ee34ec623a746c9 (diff)
downloadscummvm-rg350-d649157c5b1afae1ff6a9a565575c1eddcc880fa.tar.gz
scummvm-rg350-d649157c5b1afae1ff6a9a565575c1eddcc880fa.tar.bz2
scummvm-rg350-d649157c5b1afae1ff6a9a565575c1eddcc880fa.zip
TITANIC: Figured out original class names for TTword descendents
-rw-r--r--engines/titanic/module.mk9
-rw-r--r--engines/titanic/support/simple_file.cpp2
-rw-r--r--engines/titanic/true_talk/tt_action.cpp42
-rw-r--r--engines/titanic/true_talk/tt_action.h44
-rw-r--r--engines/titanic/true_talk/tt_adj.cpp48
-rw-r--r--engines/titanic/true_talk/tt_adj.h44
-rw-r--r--engines/titanic/true_talk/tt_major_word.cpp32
-rw-r--r--engines/titanic/true_talk/tt_major_word.h39
-rw-r--r--engines/titanic/true_talk/tt_picture.cpp46
-rw-r--r--engines/titanic/true_talk/tt_picture.h47
-rw-r--r--engines/titanic/true_talk/tt_pronoun.cpp46
-rw-r--r--engines/titanic/true_talk/tt_pronoun.h44
-rw-r--r--engines/titanic/true_talk/tt_vocab.cpp16
-rw-r--r--engines/titanic/true_talk/tt_word.cpp89
-rw-r--r--engines/titanic/true_talk/tt_word.h58
15 files changed, 451 insertions, 155 deletions
diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk
index 51ebdbbebd..d52dc568ff 100644
--- a/engines/titanic/module.mk
+++ b/engines/titanic/module.mk
@@ -460,10 +460,15 @@ MODULE_OBJS := \
true_talk/title_engine.o \
true_talk/script_handler.o \
true_talk/true_talk_manager.o \
- true_talk/tt_script_base.o \
- true_talk/tt_room_script.o \
+ true_talk/tt_action.o \
+ true_talk/tt_adj.o \
+ true_talk/tt_major_word.o \
true_talk/tt_npc_script.o \
true_talk/tt_parser.o \
+ true_talk/tt_picture.o \
+ true_talk/tt_pronoun.o \
+ true_talk/tt_room_script.o \
+ true_talk/tt_script_base.o \
true_talk/tt_scripts.o \
true_talk/tt_string.o \
true_talk/tt_string_node.o \
diff --git a/engines/titanic/support/simple_file.cpp b/engines/titanic/support/simple_file.cpp
index 80f5178298..61d941b680 100644
--- a/engines/titanic/support/simple_file.cpp
+++ b/engines/titanic/support/simple_file.cpp
@@ -399,7 +399,7 @@ bool SimpleFile::scanf(const char *format, ...) {
skipSpaces();
va_end(va);
- return !eos();
+ return true;
}
void SimpleFile::skipSpaces() {
diff --git a/engines/titanic/true_talk/tt_action.cpp b/engines/titanic/true_talk/tt_action.cpp
new file mode 100644
index 0000000000..3caca5d9b7
--- /dev/null
+++ b/engines/titanic/true_talk/tt_action.cpp
@@ -0,0 +1,42 @@
+/* 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_action.h"
+
+namespace Titanic {
+
+TTaction::TTaction(TTString &str, int val1, int val2, int val3, int val4) :
+ TTmajorWord(str, val1, val2, val3), _field30(val4) {
+}
+
+int TTaction::load(SimpleFile *file) {
+ int val;
+
+ if (!TTword::load(file, 1) && file->scanf("%d", &val)) {
+ _field30 = val;
+ return 0;
+ } else {
+ return 8;
+ }
+}
+
+} // End of namespace Titanic
diff --git a/engines/titanic/true_talk/tt_action.h b/engines/titanic/true_talk/tt_action.h
new file mode 100644
index 0000000000..3c27067eb1
--- /dev/null
+++ b/engines/titanic/true_talk/tt_action.h
@@ -0,0 +1,44 @@
+/* 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_ACTION_H
+#define TITANIC_TT_ACTION_H
+
+#include "titanic/true_talk/tt_major_word.h"
+
+namespace Titanic {
+
+class TTaction : public TTmajorWord {
+protected:
+ int _field30;
+public:
+ TTaction(TTString &str, int val1, int val2, int val3, int val4);
+
+ /**
+ * Load the word
+ */
+ int load(SimpleFile *file);
+};
+
+} // End of namespace Titanic
+
+#endif /* TITANIC_TT_ACTION_H */
diff --git a/engines/titanic/true_talk/tt_adj.cpp b/engines/titanic/true_talk/tt_adj.cpp
new file mode 100644
index 0000000000..8ee35e21fb
--- /dev/null
+++ b/engines/titanic/true_talk/tt_adj.cpp
@@ -0,0 +1,48 @@
+/* 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_adj.h"
+
+namespace Titanic {
+
+TTadj::TTadj(TTString &str, int val1, int val2, int val3, int val4) :
+ TTmajorWord(str, val1, val2, val3) {
+ if (val4 >= 0 && val4 <= 9) {
+ _field30 = val4;
+ } else {
+ _field30 = 0;
+ _status = SS_5;
+ }
+}
+
+int TTadj::load(SimpleFile *file) {
+ int val;
+
+ if (!TTword::load(file, 8) && file->scanf("%d", &val)) {
+ _field30 = val;
+ return 0;
+ } else {
+ return 8;
+ }
+}
+
+} // End of namespace Titanic
diff --git a/engines/titanic/true_talk/tt_adj.h b/engines/titanic/true_talk/tt_adj.h
new file mode 100644
index 0000000000..a0bb340980
--- /dev/null
+++ b/engines/titanic/true_talk/tt_adj.h
@@ -0,0 +1,44 @@
+/* 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_ADJ_H
+#define TITANIC_TT_ADJ_H
+
+#include "titanic/true_talk/tt_major_word.h"
+
+namespace Titanic {
+
+class TTadj : public TTmajorWord {
+protected:
+ int _field30;
+public:
+ TTadj(TTString &str, int val1, int val2, int val3, int val4);
+
+ /**
+ * Load the word
+ */
+ int load(SimpleFile *file);
+};
+
+} // End of namespace Titanic
+
+#endif /* TITANIC_TT_ADJ_H */
diff --git a/engines/titanic/true_talk/tt_major_word.cpp b/engines/titanic/true_talk/tt_major_word.cpp
new file mode 100644
index 0000000000..6df761b8ec
--- /dev/null
+++ b/engines/titanic/true_talk/tt_major_word.cpp
@@ -0,0 +1,32 @@
+/* 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_major_word.h"
+
+namespace Titanic {
+
+TTmajorWord::TTmajorWord(TTString &str, int val1, int val2, int val3) :
+ TTword(str, val1, val2), _field2C(val3) {
+}
+
+
+} // End of namespace Titanic
diff --git a/engines/titanic/true_talk/tt_major_word.h b/engines/titanic/true_talk/tt_major_word.h
new file mode 100644
index 0000000000..487c2a5f08
--- /dev/null
+++ b/engines/titanic/true_talk/tt_major_word.h
@@ -0,0 +1,39 @@
+/* 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_MAJOR_WORD_H
+#define TITANIC_TT_MAJOR_WORD_H
+
+#include "titanic/true_talk/tt_word.h"
+
+namespace Titanic {
+
+class TTmajorWord : public TTword {
+protected:
+ int _field2C;
+public:
+ TTmajorWord(TTString &str, int val1, int val2, int val3);
+};
+
+} // End of namespace Titanic
+
+#endif /* TITANIC_TT_MAJOR_WORD_H */
diff --git a/engines/titanic/true_talk/tt_picture.cpp b/engines/titanic/true_talk/tt_picture.cpp
new file mode 100644
index 0000000000..21574df195
--- /dev/null
+++ b/engines/titanic/true_talk/tt_picture.cpp
@@ -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.
+ *
+ */
+
+#include "titanic/true_talk/tt_picture.h"
+
+namespace Titanic {
+
+TTpicture::TTpicture(TTString &str, int val1, int val2, int val3, int val4, int val5, int val6) :
+ TTmajorWord(str, val1, val2, val4), _field34(val3), _field30(val5), _field3C(val6),
+ _field38(0) {
+}
+
+int TTpicture::load(SimpleFile *file) {
+ CString str;
+ int val1, val2;
+
+ if (!TTword::load(file, 2) && file->scanf("%s %d %d", &str, &val1, &val2)) {
+ _field34 = readNumber(str.c_str());
+ _field30 = val1;
+ _field3C = val2;
+ return 0;
+ } else {
+ return 3;
+ }
+}
+
+} // End of namespace Titanic
diff --git a/engines/titanic/true_talk/tt_picture.h b/engines/titanic/true_talk/tt_picture.h
new file mode 100644
index 0000000000..93f953635c
--- /dev/null
+++ b/engines/titanic/true_talk/tt_picture.h
@@ -0,0 +1,47 @@
+/* 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_PICTURE_H
+#define TITANIC_TT_PICTURE_H
+
+#include "titanic/true_talk/tt_major_word.h"
+
+namespace Titanic {
+
+class TTpicture : public TTmajorWord {
+protected:
+ int _field30;
+ int _field34;
+ int _field38;
+ int _field3C;
+public:
+ TTpicture(TTString &str, int val1, int val2, int val3, int val4, int val5, int val6);
+
+ /**
+ * Load the word
+ */
+ int load(SimpleFile *file);
+};
+
+} // End of namespace Titanic
+
+#endif /* TITANIC_TT_PICTURE_H */
diff --git a/engines/titanic/true_talk/tt_pronoun.cpp b/engines/titanic/true_talk/tt_pronoun.cpp
new file mode 100644
index 0000000000..b0e35270c5
--- /dev/null
+++ b/engines/titanic/true_talk/tt_pronoun.cpp
@@ -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.
+ *
+ */
+
+#include "titanic/true_talk/tt_pronoun.h"
+
+namespace Titanic {
+
+TTpronoun::TTpronoun(TTString &str, int val1, int val2, int val3, int val4) :
+ TTmajorWord(str, val1, val2, val3), _field30(val4) {
+}
+
+int TTpronoun::load(SimpleFile *file) {
+ int val;
+
+ if (!TTword::load(file, 6) && file->scanf("%d", &val)) {
+ if (val >= 0 && val <= 12) {
+ _field30 = val;
+ return 0;
+ } else {
+ return 5;
+ }
+ } else {
+ return 8;
+ }
+}
+
+} // End of namespace Titanic
diff --git a/engines/titanic/true_talk/tt_pronoun.h b/engines/titanic/true_talk/tt_pronoun.h
new file mode 100644
index 0000000000..991c0b39ce
--- /dev/null
+++ b/engines/titanic/true_talk/tt_pronoun.h
@@ -0,0 +1,44 @@
+/* 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_PRONOUN_H
+#define TITANIC_TT_PRONOUN_H
+
+#include "titanic/true_talk/tt_major_word.h"
+
+namespace Titanic {
+
+class TTpronoun : public TTmajorWord {
+protected:
+ int _field30;
+public:
+ TTpronoun(TTString &str, int val1, int val2, int val3, int val4);
+
+ /**
+ * Load the word
+ */
+ int load(SimpleFile *file);
+};
+
+} // End of namespace Titanic
+
+#endif /* TITANIC_TT_WORD_H */
diff --git a/engines/titanic/true_talk/tt_vocab.cpp b/engines/titanic/true_talk/tt_vocab.cpp
index 1499573f2e..1826a43d08 100644
--- a/engines/titanic/true_talk/tt_vocab.cpp
+++ b/engines/titanic/true_talk/tt_vocab.cpp
@@ -22,6 +22,12 @@
#include "common/file.h"
#include "titanic/true_talk/tt_vocab.h"
+#include "titanic/true_talk/tt_adj.h"
+#include "titanic/true_talk/tt_action.h"
+#include "titanic/true_talk/tt_adj.h"
+#include "titanic/true_talk/tt_major_word.h"
+#include "titanic/true_talk/tt_picture.h"
+#include "titanic/true_talk/tt_pronoun.h"
#include "titanic/titanic.h"
namespace Titanic {
@@ -58,14 +64,14 @@ int TTvocab::load(const CString &name) {
}
case 1: {
- TTword2 *word = new TTword2(space, 0, 0, 0, 0);
+ TTaction *word = new TTaction(space, 0, 0, 0, 0);
result = word->load(file);
_word = word;
break;
}
case 2: {
- TTword3 *word = new TTword3(space, 0, 0, 0, 0, 0, 0);
+ TTpicture *word = new TTpicture(space, 0, 0, 0, 0, 0, 0);
result = word->load(file);
_word = word;
break;
@@ -73,7 +79,7 @@ int TTvocab::load(const CString &name) {
case 3:
case 9: {
- TTword1 *word = new TTword1(space, 0, 0, 0);
+ TTmajorWord *word = new TTmajorWord(space, 0, 0, 0);
result = word->load(file, mode);
_word = word;
break;
@@ -89,14 +95,14 @@ int TTvocab::load(const CString &name) {
}
case 8: {
- TTword4 *word = new TTword4(space, 0, 0, 0, 0);
+ TTadj *word = new TTadj(space, 0, 0, 0, 0);
result = word->load(file);
_word = word;
break;
}
case 6: {
- TTword5 *word = new TTword5(space, 0, 0, 0, 0);
+ TTpronoun *word = new TTpronoun(space, 0, 0, 0, 0);
result = word->load(file);
_word = word;
break;
diff --git a/engines/titanic/true_talk/tt_word.cpp b/engines/titanic/true_talk/tt_word.cpp
index 4d4f968efd..ea68b3433a 100644
--- a/engines/titanic/true_talk/tt_word.cpp
+++ b/engines/titanic/true_talk/tt_word.cpp
@@ -173,93 +173,4 @@ void TTword::setSynFile(FileHandle file) {
_synP->_file = file;
}
-
-/*------------------------------------------------------------------------*/
-
-TTword1::TTword1(TTString &str, int val1, int val2, int val3) :
- TTword(str, val1, val2), _field2C(val3) {
-}
-
-/*------------------------------------------------------------------------*/
-
-TTword2::TTword2(TTString &str, int val1, int val2, int val3, int val4) :
- TTword1(str, val1, val2, val3), _field30(val4) {
-}
-
-int TTword2::load(SimpleFile *file) {
- int val;
-
- if (!TTword::load(file, 1) && file->scanf("%d", &val)) {
- _field30 = val;
- return 0;
- } else {
- return 8;
- }
-}
-
-/*------------------------------------------------------------------------*/
-
-TTword3::TTword3(TTString &str, int val1, int val2, int val3, int val4, int val5, int val6) :
- TTword1(str, val1, val2, val4), _field34(val3), _field30(val5), _field3C(val6),
- _field38(0) {
-}
-
-int TTword3::load(SimpleFile *file) {
- CString str;
- int val1, val2;
-
- if (!TTword::load(file, 2) && file->scanf("%s %d %d", &str, &val1, &val2)) {
- _field34 = readNumber(str.c_str());
- _field30 = val1;
- _field3C = val2;
- return 0;
- } else {
- return 3;
- }
-}
-
-/*------------------------------------------------------------------------*/
-
-TTword4::TTword4(TTString &str, int val1, int val2, int val3, int val4) :
- TTword1(str, val1, val2, val3) {
- if (val4 >= 0 && val4 <= 9) {
- _field30 = val4;
- } else {
- _field30 = 0;
- _status = SS_5;
- }
-}
-
-int TTword4::load(SimpleFile *file) {
- int val;
-
- if (!TTword::load(file, 8) && file->scanf("%d", &val)) {
- _field30 = val;
- return 0;
- } else {
- return 8;
- }
-}
-
-/*------------------------------------------------------------------------*/
-
-TTword5::TTword5(TTString &str, int val1, int val2, int val3, int val4) :
- TTword1(str, val1, val2, val3), _field30(val4) {
-}
-
-int TTword5::load(SimpleFile *file) {
- int val;
-
- if (!TTword::load(file, 6) && file->scanf("%d", &val)) {
- if (val >= 0 && val <= 12) {
- _field30 = val;
- return 0;
- } else {
- return 5;
- }
- } else {
- return 8;
- }
-}
-
} // End of namespace Titanic
diff --git a/engines/titanic/true_talk/tt_word.h b/engines/titanic/true_talk/tt_word.h
index d9127514bb..3d9001bd5d 100644
--- a/engines/titanic/true_talk/tt_word.h
+++ b/engines/titanic/true_talk/tt_word.h
@@ -127,64 +127,6 @@ public:
virtual int proc24() const { return 0; }
};
-class TTword1 : public TTword {
-protected:
- int _field2C;
-public:
- TTword1(TTString &str, int val1, int val2, int val3);
-};
-
-class TTword2 : public TTword1 {
-protected:
- int _field30;
-public:
- TTword2(TTString &str, int val1, int val2, int val3, int val4);
-
- /**
- * Load the word
- */
- int load(SimpleFile *file);
-};
-
-class TTword3 : public TTword1 {
-protected:
- int _field30;
- int _field34;
- int _field38;
- int _field3C;
-public:
- TTword3(TTString &str, int val1, int val2, int val3, int val4, int val5, int val6);
-
- /**
- * Load the word
- */
- int load(SimpleFile *file);
-};
-
-class TTword4 : public TTword1 {
-protected:
- int _field30;
-public:
- TTword4(TTString &str, int val1, int val2, int val3, int val4);
-
- /**
- * Load the word
- */
- int load(SimpleFile *file);
-};
-
-class TTword5 : public TTword1 {
-protected:
- int _field30;
-public:
- TTword5(TTString &str, int val1, int val2, int val3, int val4);
-
- /**
- * Load the word
- */
- int load(SimpleFile *file);
-};
-
} // End of namespace Titanic
#endif /* TITANIC_TT_WORD_H */