diff options
| -rw-r--r-- | scumm/script_v8.cpp | 5 | ||||
| -rw-r--r-- | scumm/string.cpp | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp index acb9b06d59..d33a445b64 100644 --- a/scumm/script_v8.cpp +++ b/scumm/script_v8.cpp @@ -736,7 +736,7 @@ void ScummEngine_v8::o8_cursorCommand() { break; case 0xE7: { // SO_CHARSET_SET int charset = pop(); - warning("Set userface charset to %d", charset); + debugC(DEBUG_GENERAL, "Set userface charset to %d", charset); // loadCharset(charset); break; } @@ -1302,8 +1302,9 @@ void ScummEngine_v8::o8_kernelSetFunctions() { // warning("o8_kernelSetFunctions: setBannerColors(%d, %d, %d, %d)", args[1], args[2], args[3], args[4]); break; case 23: // setActorChoreLimbFrame - // FIXME: This is critical, and is the cause of the Cannon "too many scripts" crash + // FIXME: This still isn't quite working correctly. See bug #754419 // This opcode is used a lot in script 28. + // warning("o8_kernelSetFunctions: setActorChoreLimbFrame(%d, %d, %d, %d)", args[1], args[2], args[3], args[4]); a = derefActor(args[1], "o8_kernelSetFunctions:setActorChoreLimbFrame"); diff --git a/scumm/string.cpp b/scumm/string.cpp index 12116a02bd..56a67d787b 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -453,7 +453,10 @@ void ScummEngine::drawString(int a) { // Note #2: If triggered "accidentaly", this code could also // cause code to be left printed when it shouldn't... if (_string[a].no_talk_anim == false) { -warning("Would have set _charset->_blitAlso = true (wanted to print '%c' = %d)", c, c); + // Sam and Max seems to blitAlso 32 a lot, which does + // nothing anyway. So just hide that one for brevity. + if (c != '32') + warning("Would have set _charset->_blitAlso = true (wanted to print '%c' = %d)", c, c); // _charset->_blitAlso = true; } } |