TITANIC: Start on vocab method for finding words with prefixes

3 files changed, 255 insertions, 220 deletions

diff --git a/engines/titanic/true_talk/tt_string.h b/engines/titanic/true_talk/tt_string.h
index 42666432c5..3cc1e5ec40 100644
--- a/engines/titanic/true_talk/tt_string.h
+++ b/engines/titanic/true_talk/tt_string.h
@@ -83,6 +83,12 @@ public:
 		_data->_string.deleteLastChar();
 	}
 
+	bool hasPrefix(const CString &str) const {
+		return _data->_string.hasPrefix(str);
+	}
+	bool hasPrefix(const const char *str) const {
+		return _data->_string.hasPrefix(str);
+	}
 	bool hasSuffix(const CString &str) const {
 		return _data->_string.hasSuffix(str);
 	}
diff --git a/engines/titanic/true_talk/tt_vocab.cpp b/engines/titanic/true_talk/tt_vocab.cpp
index 458c0a10d7..dfe894dcd1 100644
--- a/engines/titanic/true_talk/tt_vocab.cpp
+++ b/engines/titanic/true_talk/tt_vocab.cpp
@@ -1,219 +1,248 @@
-/* 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 "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 {
-
-TTvocab::TTvocab(int val): _headP(nullptr), _tailP(nullptr), _word(nullptr),
-		_fieldC(0), _field10(0), _vocabMode(val) {
-	_field14 = load("STVOCAB.TXT");
-}
-
-TTvocab::~TTvocab() {
-	if (_headP) {
-		_headP->deleteSiblings();
-		delete _headP;
-		_headP = _tailP = nullptr;
-	}
-}
-
-int TTvocab::load(const CString &name) {
-	SimpleFile *file = g_vm->_exeResources._owner->openResource(name);
-	int result = 0;
-	bool skipFlag;
-
-	while (!result && !file->eos()) {
-		skipFlag = false;
-		int mode = file->readNumber();
-		TTstring space(" ");
-
-		switch (mode) {
-		case 0: {
-			if (_word)
-				result = _word->readSyn(file);
-			skipFlag = true;
-			break;
-		}
-
-		case 1: {
-			TTaction *word = new TTaction(space, 0, 0, 0, 0);
-			result = word->load(file);
-			_word = word;
-			break;
-		}
-
-		case 2: {
-			TTpicture *word = new TTpicture(space, 0, 0, 0, 0, 0, 0);
-			result = word->load(file);
-			_word = word;
-			break;
-		}
-
-		case 3:
-		case 9: {
-			TTmajorWord *word = new TTmajorWord(space, 0, 0, 0);
-			result = word->load(file, mode);
-			_word = word;
-			break;
-		}
-
-		case 4:
-		case 5:
-		case 7: {
-			TTword *word = new TTword(space, 0, 0);
-			result = word->load(file, mode);
-			_word = word;
-			break;
-		}
-
-		case 8: {
-			TTadj *word = new TTadj(space, 0, 0, 0, 0);
-			result = word->load(file);
-			_word = word;
-			break;
-		}
-
-		case 6: {
-			TTpronoun *word = new TTpronoun(space, 0, 0, 0, 0);
-			result = word->load(file);
-			_word = word;
-			break;
-		}
-
-		default:
-			result = 4;
-			break;
-		}
-
-		if (!skipFlag && _word) {
-			if (result) {
-				// Something wrong occurred, so delete word
-				delete _word;
-				_word = nullptr;
-			} else {
-				// Add the word to the master vocab list
-				addWord(_word);
-			}
-		}
-	}
-
-	// Close resource and return result
-	delete file;
-	return result;
-}
-
-void TTvocab::addWord(TTword *word) {
-	TTword *existingWord = findWord(word->_string);
-
-	if (existingWord) {
-		if (word->_synP) {
-			// Move over the synonym
-			existingWord->appendNode(word->_synP);
-			word->_synP = nullptr;
-		}
-
-		_word = nullptr;
-		if (word)
-			delete word;
-	} else if (_tailP) {
-		_tailP->_nextP = word;
-		_tailP = word;
-	} else {
-		if (!_headP)
-			_headP = word;
-
-		_tailP = word;
-	}
-}
-
-TTword *TTvocab::findWord(const TTstring &str) {
-	TTsynonym *tempNode = new TTsynonym();
-	bool flag = false;
-	TTword *word = _headP;
-
-	while (word && !flag) {
-		if (_vocabMode != 3 || strcmp(word->c_str(), str)) {
-			if (word->findSynByName(str, tempNode, _vocabMode))
-				flag = true;
-			else
-				word = word->_nextP;
-		} else {
-			flag = true;
-		}
-	}
-
-	delete tempNode;
-	return word;
-}
-
-TTword *TTvocab::getPrimeWord(TTstring &str, TTword **srcWord) const {
-	TTsynonym tempSyn;
-	char c = str.charAt(0);
-	TTword *newWord = nullptr;
-	TTword *vocabP;
-
-	if (!Common::isDigit(c)) {
-		vocabP = _headP;
-		newWord = new TTword(str, 3, 300);
-	} else {
-		for (vocabP = _headP; vocabP && !newWord; vocabP = vocabP->_nextP) {
-			if (_vocabMode == 3 && !strcmp(str.c_str(), vocabP->c_str())) {
-				newWord = vocabP->copy();
-				newWord->_nextP = nullptr;
-				newWord->setSyn(nullptr);
-			} else if (vocabP->findSynByName(str, &tempSyn, _vocabMode)) {
-				// Create a copy of the word and the found synonym
-				TTsynonym *newSyn = new TTsynonym(tempSyn);
-				newSyn->_nextP = newSyn->_priorP = nullptr;
-				newWord = vocabP->copy();
-				newWord->_nextP = nullptr;
-				newWord->setSyn(newSyn);
-			}
-		}
-	}
-
-	if (srcWord)
-		// Pass out the pointer to the original word
-		*srcWord = vocabP;
-	
-	// Return the new copy of the word
-	return newWord;
-}
-
-void TTvocab::fn1(TTstring &str) {
-	TTstring tempStr(str);
-	
-	if (tempStr.contains("pre")) {
-
-	}
-}
-
-} // End of namespace Titanic
+/* 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 "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 {

+

+TTvocab::TTvocab(int val): _headP(nullptr), _tailP(nullptr), _word(nullptr),

+		_fieldC(0), _field10(0), _vocabMode(val) {

+	_field14 = load("STVOCAB.TXT");

+}

+

+TTvocab::~TTvocab() {

+	if (_headP) {

+		_headP->deleteSiblings();

+		delete _headP;

+		_headP = _tailP = nullptr;

+	}

+}

+

+int TTvocab::load(const CString &name) {

+	SimpleFile *file = g_vm->_exeResources._owner->openResource(name);

+	int result = 0;

+	bool skipFlag;

+

+	while (!result && !file->eos()) {

+		skipFlag = false;

+		int mode = file->readNumber();

+		TTstring space(" ");

+

+		switch (mode) {

+		case 0: {

+			if (_word)

+				result = _word->readSyn(file);

+			skipFlag = true;

+			break;

+		}

+

+		case 1: {

+			TTaction *word = new TTaction(space, 0, 0, 0, 0);

+			result = word->load(file);

+			_word = word;

+			break;

+		}

+

+		case 2: {

+			TTpicture *word = new TTpicture(space, 0, 0, 0, 0, 0, 0);

+			result = word->load(file);

+			_word = word;

+			break;

+		}

+

+		case 3:

+		case 9: {

+			TTmajorWord *word = new TTmajorWord(space, 0, 0, 0);

+			result = word->load(file, mode);

+			_word = word;

+			break;

+		}

+

+		case 4:

+		case 5:

+		case 7: {

+			TTword *word = new TTword(space, 0, 0);

+			result = word->load(file, mode);

+			_word = word;

+			break;

+		}

+

+		case 8: {

+			TTadj *word = new TTadj(space, 0, 0, 0, 0);

+			result = word->load(file);

+			_word = word;

+			break;

+		}

+

+		case 6: {

+			TTpronoun *word = new TTpronoun(space, 0, 0, 0, 0);

+			result = word->load(file);

+			_word = word;

+			break;

+		}

+

+		default:

+			result = 4;

+			break;

+		}

+

+		if (!skipFlag && _word) {

+			if (result) {

+				// Something wrong occurred, so delete word

+				delete _word;

+				_word = nullptr;

+			} else {

+				// Add the word to the master vocab list

+				addWord(_word);

+			}

+		}

+	}

+

+	// Close resource and return result

+	delete file;

+	return result;

+}

+

+void TTvocab::addWord(TTword *word) {

+	TTword *existingWord = findWord(word->_string);

+

+	if (existingWord) {

+		if (word->_synP) {

+			// Move over the synonym

+			existingWord->appendNode(word->_synP);

+			word->_synP = nullptr;

+		}

+

+		_word = nullptr;

+		if (word)

+			delete word;

+	} else if (_tailP) {

+		_tailP->_nextP = word;

+		_tailP = word;

+	} else {

+		if (!_headP)

+			_headP = word;

+

+		_tailP = word;

+	}

+}

+

+TTword *TTvocab::findWord(const TTstring &str) {

+	TTsynonym *tempNode = new TTsynonym();

+	bool flag = false;

+	TTword *word = _headP;

+

+	while (word && !flag) {

+		if (_vocabMode != 3 || strcmp(word->c_str(), str)) {

+			if (word->findSynByName(str, tempNode, _vocabMode))

+				flag = true;

+			else

+				word = word->_nextP;

+		} else {

+			flag = true;

+		}

+	}

+

+	delete tempNode;

+	return word;

+}

+

+TTword *TTvocab::getPrimeWord(TTstring &str, TTword **srcWord) const {

+	TTsynonym tempSyn;

+	char c = str.charAt(0);

+	TTword *newWord = nullptr;

+	TTword *vocabP;

+

+	if (!Common::isDigit(c)) {

+		vocabP = _headP;

+		newWord = new TTword(str, 3, 300);

+	} else {

+		for (vocabP = _headP; vocabP && !newWord; vocabP = vocabP->_nextP) {

+			if (_vocabMode == 3 && !strcmp(str.c_str(), vocabP->c_str())) {

+				newWord = vocabP->copy();

+				newWord->_nextP = nullptr;

+				newWord->setSyn(nullptr);

+			} else if (vocabP->findSynByName(str, &tempSyn, _vocabMode)) {

+				// Create a copy of the word and the found synonym

+				TTsynonym *newSyn = new TTsynonym(tempSyn);

+				newSyn->_nextP = newSyn->_priorP = nullptr;

+				newWord = vocabP->copy();

+				newWord->_nextP = nullptr;

+				newWord->setSyn(newSyn);

+			}

+		}

+	}

+

+	if (srcWord)

+		// Pass out the pointer to the original word

+		*srcWord = vocabP;

+	

+	// Return the new copy of the word

+	return newWord;

+}

+

+void TTvocab::fn1(TTstring &str) {

+	TTstring tempStr(str);

+	TTword *word = nullptr;

+	int prefixLen = 0;

+

+	if (tempStr.hasPrefix("pre")) {

+		prefixLen = 3;

+	} else if (tempStr.hasPrefix("re") || tempStr.hasPrefix("co")) {

+		prefixLen = 2;

+	} else if (tempStr.hasPrefix("inter") || tempStr.hasPrefix("multi")) {

+		prefixLen = 5;

+	} else if (tempStr.hasPrefix("over") || tempStr.hasPrefix("post") || tempStr.hasPrefix("self")) {

+		prefixLen = 4;

+	}


+	if (prefixLen) {

+		// Known prefix found, so scan for word without prefix

+		tempStr.deletePrefix(prefixLen);

+		word = getPrimeWord(tempStr);

+		if (word)

+			tempStr = str;

+	} else {

+		if (tempStr.hasPrefix("anti"))

+			prefixLen = 4;

+		else if (tempStr.hasPrefix("counter"))

+			prefixLen = 7;

+

+		if (prefixLen) {

+			tempStr.deletePrefix(prefixLen);

+			word = getPrimeWord(tempStr);

+			if (word)

+				tempStr = str;

+		}

+	}

+

+	// TODO

+}

+

+} // End of namespace Titanic

diff --git a/engines/titanic/true_talk/tt_vocab.h b/engines/titanic/true_talk/tt_vocab.h
index 0a3e826fe6..16515cee26 100644
--- a/engines/titanic/true_talk/tt_vocab.h
+++ b/engines/titanic/true_talk/tt_vocab.h
@@ -65,7 +65,7 @@ public:
 	 * @param srcWord	Optional pointer to store the original word match was found on
 	 * @returns			A new word instance if a match if found, or null if not
 	 */
-	TTword *getPrimeWord(TTstring &str, TTword **srcWord) const;
+	TTword *getPrimeWord(TTstring &str, TTword **srcWord = nullptr) const;
 
 	void fn1(TTstring &str);
 };