GLK: ADVSYS: Fix inputs with indirect objects

scummvm · Jun 17, 2019 · fee7221 · fee7221
1 parent 0bf2dc6
commit fee7221
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/engines/glk/advsys/vm.cpp b/engines/glk/advsys/vm.cpp
@@ -488,7 +488,7 @@ bool VM::parseInput() {
 				preposition = *_wordPtr++;
 
 			// Get the indirect object
-			noun2 = _adjectiveList.size();
+			noun2 = _adjectiveList.size() + 1;
 			for (;;) {
 				// Get the indirect object
 				if (!getNoun())
@@ -615,10 +615,15 @@ uint VM::getNoun() {
 	_adjectiveList.push_back(AdjectiveEntry());
 	assert(_adjectiveList.size() <= 20);
 
+	if (_wordPtr == _words.end() || getWordType(*_wordPtr) != WT_NOUN) {
+		parseError();
+		return NIL;
+	}
+
 	// Add a noun entry to the list
 	Noun n;
 	n._adjective = &_adjectiveList[alStart];
-	n._noun = (_wordPtr == _words.end()) ? 0 : *_wordPtr++;
+	n._noun = *_wordPtr++;
 	n._num = _wordPtr - _words.begin() - 1;
 	_nouns.push_back(n);