[Scummvm-cvs-logs] SF.net SVN: scummvm:[51243] scummvm/trunk/engines/sci
m_kiewitz at users.sourceforge.net
m_kiewitz at users.sourceforge.net
Sat Jul 24 13:59:40 CEST 2010
Revision: 51243
http://scummvm.svn.sourceforge.net/scummvm/?rev=51243&view=rev
Author: m_kiewitz
Date: 2010-07-24 11:59:40 +0000 (Sat, 24 Jul 2010)
Log Message:
-----------
SCI: fix warning and remove duplicate code
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/scriptdebug.cpp
scummvm/trunk/engines/sci/graphics/paint16.cpp
Modified: scummvm/trunk/engines/sci/engine/scriptdebug.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/scriptdebug.cpp 2010-07-24 11:51:09 UTC (rev 51242)
+++ scummvm/trunk/engines/sci/engine/scriptdebug.cpp 2010-07-24 11:59:40 UTC (rev 51243)
@@ -488,48 +488,7 @@
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;
Modified: scummvm/trunk/engines/sci/graphics/paint16.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/paint16.cpp 2010-07-24 11:51:09 UTC (rev 51242)
+++ scummvm/trunk/engines/sci/graphics/paint16.cpp 2010-07-24 11:59:40 UTC (rev 51243)
@@ -534,7 +534,7 @@
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++;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list