[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.186,1.187 script_v8.cpp,2.223,2.224
James Brown
ender at users.sourceforge.net
Fri Jan 16 00:35:02 CET 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv7734
Modified Files:
string.cpp script_v8.cpp
Log Message:
Just hide a few noisy warnings.
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -d -r1.186 -r1.187
--- string.cpp 15 Jan 2004 20:39:24 -0000 1.186
+++ string.cpp 16 Jan 2004 08:34:42 -0000 1.187
@@ -453,7 +453,10 @@
// 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;
}
}
Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.223
retrieving revision 2.224
diff -u -d -r2.223 -r2.224
--- script_v8.cpp 15 Jan 2004 19:25:17 -0000 2.223
+++ script_v8.cpp 16 Jan 2004 08:34:42 -0000 2.224
@@ -736,7 +736,7 @@
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 @@
// 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");
More information about the Scummvm-git-logs
mailing list