aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/kparse.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2010-12-28 21:05:30 +0000
committerFilippos Karapetis2010-12-28 21:05:30 +0000
commit7bc1ff065b4d63c233e7b5a286f7065ec349a973 (patch)
tree926118245f4792900cd894110dac6f474c8e12ce /engines/sci/engine/kparse.cpp
parentab01c8e5fc68a3445f4fe2d0edb49fbc6fc3fa49 (diff)
downloadscummvm-rg350-7bc1ff065b4d63c233e7b5a286f7065ec349a973.tar.gz
scummvm-rg350-7bc1ff065b4d63c233e7b5a286f7065ec349a973.tar.bz2
scummvm-rg350-7bc1ff065b4d63c233e7b5a286f7065ec349a973.zip
SCI: Fixed script bug #3038870 - "SCI Fanmade - Demo Quest: ScummVM hangs with typo" and
removed a related FIXME svn-id: r55056
Diffstat (limited to 'engines/sci/engine/kparse.cpp')
-rw-r--r--engines/sci/engine/kparse.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/engines/sci/engine/kparse.cpp b/engines/sci/engine/kparse.cpp
index 076ca59cdb..4db59f9738 100644
--- a/engines/sci/engine/kparse.cpp
+++ b/engines/sci/engine/kparse.cpp
@@ -143,16 +143,8 @@ reg_t kParse(EngineState *s, int argc, reg_t *argv) {
} else {
s->r_acc = make_reg(0, 0);
- // FIXME: When typing something wrong in the fanmade game Demo Quest,
- // after the error dialog, the game checks for claimed to be 0 before
- // showing a subsequent dialog. The following selector change causes
- // it to be 1, thus causing the game to hang in an endless loop (bug
- // #3038870. Thus, this seems to be wrong (since fanmade games use
- // the original SCI interpreter), but we need to check against
- // dissassembly. Since kParse is in the process of being dissassembled
- // again, I'm leaving this FIXME in for now, so that it won't be
- // forgotten :)
writeSelectorValue(segMan, event, SELECTOR(claimed), 1);
+
if (error) {
s->_segMan->strcpy(s->_segMan->getParserPtr(), error);
debugC(2, kDebugLevelParser, "Word unknown: %s", error);