libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-23 04:33:09 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

SCI: fix warning and remove duplicate code

Browse Source 
svn-id: r51243
This commit is contained in:
Martin Kiewitz 2010-07-24 11:59:40 +00:00
parent d49d1d60fe
commit 63c945f93a
2 changed files with 2 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
engines/sci/engine/scriptdebug.cpp
View File

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

2
engines/sci/graphics/paint16.cpp
View File

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