[Scummvm-git-logs] scummvm master -> 8c48fd6bc71998ef8fde92f9b53c0ec593e4ef6e

[dreammaster]

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

Summary:
8c48fd6bc7 TITANIC: Don't untimely remove unrecognised COMPLEX_VERB parser nodes


Commit: 8c48fd6bc71998ef8fde92f9b53c0ec593e4ef6e
    https://github.com/scummvm/scummvm/commit/8c48fd6bc71998ef8fde92f9b53c0ec593e4ef6e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-27T21:50:37-05:00

Commit Message:
TITANIC: Don't untimely remove unrecognised COMPLEX_VERB parser nodes

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


diff --git a/engines/titanic/true_talk/tt_parser.cpp b/engines/titanic/true_talk/tt_parser.cpp
index ca72b94..2ef93d7 100644
--- a/engines/titanic/true_talk/tt_parser.cpp
+++ b/engines/titanic/true_talk/tt_parser.cpp
@@ -1143,9 +1143,8 @@ int TTparser::considerRequests(TTword *word) {
 						_sentenceConcept->get18());
 					status = _sentenceConcept->createConcept(1, 1, verbP);
 					delete verbP;
+					flag = true;
 				}
-
-				flag = true;
 			}
 			break;
 
@@ -1276,8 +1275,11 @@ int TTparser::considerRequests(TTword *word) {
 		}
 
 		TTparserNode *nextP = dynamic_cast<TTparserNode *>(nodeP->_nextP);
-		if (flag)
+		if (flag) {
 			removeNode(nodeP);
+			flag = false;
+		}
+
 		nodeP = nextP;
 	}