[Scummvm-git-logs] scummvm master -> 54e6dff4722ad584c39ef1c1d9ba0182d98f15d1

[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:
54e6dff472 GLK: COMPREHEND: Fix compounds like 'drop item1, item2'


Commit: 54e6dff4722ad584c39ef1c1d9ba0182d98f15d1
    https://github.com/scummvm/scummvm/commit/54e6dff4722ad584c39ef1c1d9ba0182d98f15d1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-12-01T20:55:29-08:00

Commit Message:
GLK: COMPREHEND: Fix compounds like 'drop item1, item2'

Changed paths:
    engines/glk/comprehend/game.cpp


diff --git a/engines/glk/comprehend/game.cpp b/engines/glk/comprehend/game.cpp
index f580d1613d..83555b661a 100644
--- a/engines/glk/comprehend/game.cpp
+++ b/engines/glk/comprehend/game.cpp
@@ -842,19 +842,18 @@ void ComprehendGame::read_input() {
 		_nounState = NOUNSTATE_STANDARD;
 
 		read_sentence(&tempSentence);
-		_sentence.copyFrom(tempSentence, tempSentence._formattedWords[0] || prevNounState != NOUNSTATE_QUERY);
+		_sentence.copyFrom(tempSentence, tempSentence._formattedWords[0] || prevNounState != NOUNSTATE_STANDARD);
 
 		handled = handle_sentence(&_sentence);
-		if (handled)
-			afterTurn();
+		if (!handled)
+			return;
 
 		/* FIXME - handle the 'before you can continue' case */
 		if (_inputLine[_inputLineIndex] == '\0')
 			break;
-
-		if (handled)
-			doBeforeTurn();
 	}
+
+	afterTurn();
 }
 
 void ComprehendGame::playGame() {