[Scummvm-git-logs] scummvm master -> 6b941f0813524c92baca481995de5366663f4f7f

[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:
6b941f0813 GLK: COMPREHEND: Allow for 'and' to separate items


Commit: 6b941f0813524c92baca481995de5366663f4f7f
    https://github.com/scummvm/scummvm/commit/6b941f0813524c92baca481995de5366663f4f7f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-12-06T21:28:29-08:00

Commit Message:
GLK: COMPREHEND: Allow for 'and' to separate items

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


diff --git a/engines/glk/comprehend/game.cpp b/engines/glk/comprehend/game.cpp
index 703873fab8..41d3b6498b 100644
--- a/engines/glk/comprehend/game.cpp
+++ b/engines/glk/comprehend/game.cpp
@@ -732,7 +732,9 @@ void ComprehendGame::read_sentence(Sentence *sentence) {
 		Common::String wordStr(word_string, p);
 
 		// Check for end of sentence
-		if (*p == ',' || *p == '\n') {
+		// FIXME: The below is a hacked simplified version of how the
+		// original handles cases like "get item1, item2"
+		if (*p == ',' || *p == '\n' || wordStr.equalsIgnoreCase("and")) {
 			// Sentence separator
 			++p;
 			sentence_end = true;