diff options
| author | Filippos Karapetis | 2010-07-22 15:56:26 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-07-22 15:56:26 +0000 |
| commit | 28bc31a13991b71d7007eaaf82c6f80f09144734 (patch) | |
| tree | 550883582ea320e1abbd262f4d95463439447fe1 /engines | |
| parent | 6c41ca440509d2f965c71d8fcd0502b4d042d0a6 (diff) | |
| download | scummvm-rg350-28bc31a13991b71d7007eaaf82c6f80f09144734.tar.gz scummvm-rg350-28bc31a13991b71d7007eaaf82c6f80f09144734.tar.bz2 scummvm-rg350-28bc31a13991b71d7007eaaf82c6f80f09144734.zip | |
When modifying variable selectors with argc > 1, don't throw a warning, but use a debugC instead. These are usually typos in the original scripts, and aren't fatal
svn-id: r51147
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/engine/vm.cpp | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index 61cc4c429a..b1945d1cf4 100644 --- a/engines/sci/engine/vm.cpp +++ b/engines/sci/engine/vm.cpp @@ -541,30 +541,17 @@ ExecStack *send_selector(EngineState *s, reg_t send_obj, reg_t work_obj, StackPt if (argc > 1) { // argc can indeed be bigger than 1 in some cases, and it's usually the - // result of a script bug + // result of a script bug. Usually these aren't fatal. const char *objectName = s->_segMan->getObjectName(send_obj); - const SciGameId gameId = g_sci->getGameId(); - - if (gameId == GID_SQ4 && !strcmp(objectName, "Sq4GlobalNarrator") && selector == 606) { - // SQ4 has a script bug in the Sq4GlobalNarrator object when invoking the - // returnVal selector, which doesn't affect gameplay, thus don't diplay it - } else if (gameId == GID_QFG1VGA && !strcmp(objectName, "longSong") && selector == 3) { - // QFG1VGA has a script bug in the longSong object when invoking the - // loop selector, which doesn't affect gameplay, thus don't diplay it - } else if (gameId == GID_CASTLEBRAIN && !strcmp(objectName, "PuzPiece") && selector == 77) { - // Castle of Dr. Brain has a script bug in the PuzPiece object when invoking - // the value selector, which doesn't affect gameplay, thus don't display it - } else { - // Unknown script bug, show it. Usually these aren't fatal. - reg_t oldReg = *varp.getPointer(s->_segMan); - reg_t newReg = argp[1]; - const char *selectorName = g_sci->getKernel()->getSelectorName(selector).c_str(); - warning("send_selector(): argc = %d while modifying variable selector " - "%x (%s) of object %04x:%04x (%s) from %04x:%04x to %04x:%04x", - argc, selector, selectorName, PRINT_REG(send_obj), - objectName, PRINT_REG(oldReg), PRINT_REG(newReg)); - } + + reg_t oldReg = *varp.getPointer(s->_segMan); + reg_t newReg = argp[1]; + const char *selectorName = g_sci->getKernel()->getSelectorName(selector).c_str(); + debug(2, "send_selector(): argc = %d while modifying variable selector " + "%x (%s) of object %04x:%04x (%s) from %04x:%04x to %04x:%04x", + argc, selector, selectorName, PRINT_REG(send_obj), + objectName, PRINT_REG(oldReg), PRINT_REG(newReg)); } { |