[Scummvm-git-logs] scummvm branch-2-3 -> 87d6bff265f77bda37a62992b88e8a40f6ceb915

[dreammaster]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c17c9b7dd6 TITANIC: Make findByWordClass a static method
87d6bff265 TITANIC: Add entry for should fix to NEWS.md


Commit: c17c9b7dd673181228021fbfc7e2f6e391b30afe
    https://github.com/scummvm/scummvm/commit/c17c9b7dd673181228021fbfc7e2f6e391b30afe
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-09-20T18:55:10-07:00

Commit Message:
TITANIC: Make findByWordClass a static method

Changed paths:
    engines/titanic/true_talk/tt_concept.cpp
    engines/titanic/true_talk/tt_concept.h
    engines/titanic/true_talk/tt_parser.cpp


diff --git a/engines/titanic/true_talk/tt_concept.cpp b/engines/titanic/true_talk/tt_concept.cpp
index aed621bd99..710c5874ce 100644
--- a/engines/titanic/true_talk/tt_concept.cpp
+++ b/engines/titanic/true_talk/tt_concept.cpp
@@ -283,8 +283,8 @@ TTconcept *TTconcept::findByWordId(int id) {
 	return nullptr;
 }
 
-TTconcept *TTconcept::findByWordClass(WordClass wordClass) {
-	for (TTconcept *conceptP = this; conceptP; conceptP = conceptP->_nextP) {
+TTconcept *TTconcept::findByWordClass(TTconcept *conceptP, WordClass wordClass) {
+	for (; conceptP; conceptP = conceptP->_nextP) {
 		if (conceptP->_wordP && conceptP->_wordP->_wordClass == wordClass)
 			return conceptP;
 	}
diff --git a/engines/titanic/true_talk/tt_concept.h b/engines/titanic/true_talk/tt_concept.h
index 04da0cf49d..a06073e656 100644
--- a/engines/titanic/true_talk/tt_concept.h
+++ b/engines/titanic/true_talk/tt_concept.h
@@ -152,7 +152,7 @@ public:
 	/**
 	 * Find a word by it's class
 	 */
-	TTconcept *findByWordClass(WordClass wordClass);
+	static TTconcept *findByWordClass(TTconcept *conceptP, WordClass wordClass);
 
 	TTconcept *findBy20(int val);
 
diff --git a/engines/titanic/true_talk/tt_parser.cpp b/engines/titanic/true_talk/tt_parser.cpp
index 14237ddd50..98501cb5eb 100644
--- a/engines/titanic/true_talk/tt_parser.cpp
+++ b/engines/titanic/true_talk/tt_parser.cpp
@@ -927,7 +927,7 @@ int TTparser::considerRequests(TTword *word) {
 
 		case SEEK_OWNERSHIP:
 			if (word->_id == 601) {
-				if (_conceptP->findByWordClass(WC_THING))
+				if (TTconcept::findByWordClass(_conceptP, WC_THING))
 					status = _conceptP->setOwner(word, false);
 
 				flag = true;
@@ -969,7 +969,7 @@ int TTparser::considerRequests(TTword *word) {
 				case WC_ABSTRACT:
 					if (word->_id != 300) {
 						status = processModifiers(3, word);
-					} else if (!_conceptP || !_conceptP->findByWordClass(WC_THING)) {
+					} else if (!TTconcept::findByWordClass(_conceptP, WC_THING)) {
 						status = processModifiers(3, word);
 					} else {
 						word->_id = atoi(word->_text.c_str());
@@ -980,7 +980,7 @@ int TTparser::considerRequests(TTword *word) {
 						addToConceptList(word);
 					break;
 				case WC_ADJECTIVE: {
-					TTconcept *conceptP = _conceptP->findByWordClass(WC_THING);
+					TTconcept *conceptP = TTconcept::findByWordClass(_conceptP, WC_THING);
 					if (conceptP) {
 						conceptP->_string2 += ' ';
 						conceptP->_string2 += word->getText();
@@ -997,7 +997,7 @@ int TTparser::considerRequests(TTword *word) {
 								currP->_field34 = 1;
 						}
 					} else {
-						TTconcept *conceptP = _conceptP->findByWordClass(WC_ACTION);
+						TTconcept *conceptP = TTconcept::findByWordClass(_conceptP, WC_ACTION);
 
 						if (conceptP) {
 							conceptP->_string2 += ' ';


Commit: 87d6bff265f77bda37a62992b88e8a40f6ceb915
    https://github.com/scummvm/scummvm/commit/87d6bff265f77bda37a62992b88e8a40f6ceb915
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-09-20T18:55:50-07:00

Commit Message:
TITANIC: Add entry for should fix to NEWS.md

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index 96d8c70246..52cd895f12 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -186,6 +186,9 @@ For a more comprehensive changelog of the latest experimental code, see:
  Tinsel:
    - Enabled the Return to Launcher feature.
 
+ Titanic:
+   - Fixed crashes when asking bots what I should do.
+
  TsAGE:
    - Added support for uninstalled floppy version.