libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 05:38:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GLK: ADVSYS: Fix inputs with indirect objects

Browse Source
This commit is contained in:
Paul Gilbert 2019-06-16 17:43:07 -07:00
parent 0bf2dc6d7b
commit fee7221810
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engines/glk/advsys/vm.cpp
View File

@ -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);