diff options
| author | Martin Kiewitz | 2010-07-24 11:59:40 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-07-24 11:59:40 +0000 |
| commit | 63c945f93ae01d046b092e783154d57609d68a79 (patch) | |
| tree | 6ec7adc06a249eb111b085bf4f6268384a72b44c | |
| parent | d49d1d60feabe7f3fe7691ed27b2627e35de848a (diff) | |
| download | scummvm-rg350-63c945f93ae01d046b092e783154d57609d68a79.tar.gz scummvm-rg350-63c945f93ae01d046b092e783154d57609d68a79.tar.bz2 scummvm-rg350-63c945f93ae01d046b092e783154d57609d68a79.zip | |
SCI: fix warning and remove duplicate code
svn-id: r51243
| -rw-r--r-- | engines/sci/engine/scriptdebug.cpp | 43 | ||||
| -rw-r--r-- | engines/sci/graphics/paint16.cpp | 2 |
2 files changed, 2 insertions, 43 deletions
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp index 4521995123..9c08526fbb 100644 --- a/engines/sci/engine/scriptdebug.cpp +++ b/engines/sci/engine/scriptdebug.cpp @@ -488,48 +488,7 @@ void Kernel::dissectScript(int scriptNumber, Vocabulary *vocab) { Common::hexdump(script->data + seeker, objsize - 4, 16, seeker); printf("%04x: ", seeker); - while (seeker < _seeker) { - uint16 nextitem = script->data [seeker++]; - if (nextitem == 0xFF) - printf("\n%04x: ", seeker); - else if (nextitem >= 0xF0) { - switch (nextitem) { - case 0xf0: - printf(", "); - break; - case 0xf1: - printf("& "); - break; - case 0xf2: - printf("/ "); - break; - case 0xf3: - printf("( "); - break; - case 0xf4: - printf(") "); - break; - case 0xf5: - printf("[ "); - break; - case 0xf6: - printf("] "); - break; - case 0xf7: - printf("# "); - break; - case 0xf8: - printf("< "); - break; - case 0xf9: - printf("> "); - break; - } - } else { - nextitem = nextitem << 8 | script->data [seeker++]; - printf("%s[%03x] ", vocab->getAnyWordFromGroup(nextitem), nextitem); - } - } + vocab->debugDecipherSaidBlock(script->data + seeker); printf("\n"); break; diff --git a/engines/sci/graphics/paint16.cpp b/engines/sci/graphics/paint16.cpp index 9361c1adbc..4227c458c5 100644 --- a/engines/sci/graphics/paint16.cpp +++ b/engines/sci/graphics/paint16.cpp @@ -534,7 +534,7 @@ reg_t GfxPaint16::kernelDisplay(const char *text, int argc, reg_t *argv) { case SCI_DISPLAY_DUMMY1: case SCI_DISPLAY_DUMMY2: if (!((g_sci->getGameId() == GID_LONGBOW) && (g_sci->isDemo()))) - error("Unknown kDisplay argument %X", displayArg); + error("Unknown kDisplay argument %X", displayArg.offset); if (displayArg.offset == SCI_DISPLAY_DUMMY2) { if (argc) { argc--; argv++; |