[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.138,1.139 charset.cpp,2.53,2.54 imuse_digi.cpp,1.32,1.33 resource.cpp,1.105,1.106 script_v5.cpp,1.132,1.133 script_v6.cpp,1.168,1.169 script_v8.cpp,2.182,2.183 string.cpp,1.144,1.145
Max Horn
fingolfin at users.sourceforge.net
Sun Jul 13 09:23:11 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv17573/scumm
Modified Files:
actor.cpp charset.cpp imuse_digi.cpp resource.cpp
script_v5.cpp script_v6.cpp script_v8.cpp string.cpp
Log Message:
debug/warning/error all automatically output a newline
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- actor.cpp 12 Jul 2003 22:41:58 -0000 1.138
+++ actor.cpp 13 Jul 2003 16:22:16 -0000 1.139
@@ -1426,7 +1426,7 @@
byte *Actor::getActorName() {
byte *ptr = _vm->getResourceAddress(rtActorName, number);
if (ptr == NULL) {
- warning("Failed to find name of actor %d\n", number);
+ warning("Failed to find name of actor %d", number);
}
return ptr;
}
Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.53
retrieving revision 2.54
diff -u -d -r2.53 -r2.54
--- charset.cpp 26 Jun 2003 21:41:53 -0000 2.53
+++ charset.cpp 13 Jul 2003 16:22:17 -0000 2.54
@@ -55,7 +55,7 @@
_fontPtr = _vm->getResourceAddress(rtCharset, id);
if (_fontPtr == 0)
- error("CharsetRendererCommon::setCurID: charset %d not found!\n", id);
+ error("CharsetRendererCommon::setCurID: charset %d not found!", id);
if (_vm->_version == 4)
_fontPtr += 17;
@@ -70,7 +70,7 @@
_fontPtr = _vm->getResourceAddress(rtCharset, id);
if (_fontPtr == 0)
- error("CharsetRendererCommon::setCurID: charset %d not found!\n", id);
+ error("CharsetRendererCommon::setCurID: charset %d not found!", id);
_nbChars = _fontPtr[4];
_fontPtr += 6;
Index: imuse_digi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- imuse_digi.cpp 2 Jul 2003 11:04:48 -0000 1.32
+++ imuse_digi.cpp 13 Jul 2003 16:22:17 -0000 1.33
@@ -1114,7 +1114,7 @@
tmp /= 2;
}
_channel[chan]._volumeFadeStep = tmp;
- debug(1, "volumeFade is %d, step is %d\n", d, tmp);
+ debug(1, "volumeFade is %d, step is %d", d, tmp);
return 0;
default:
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- resource.cpp 6 Jul 2003 15:02:13 -0000 1.105
+++ resource.cpp 13 Jul 2003 16:22:17 -0000 1.106
@@ -886,7 +886,7 @@
return 1;
} else {
- fprintf(stderr, "WARNING: Unrecognized base tag 0x%08x in sound %d\n", basetag, idx);
+ warning("Unrecognized base tag 0x%08x in sound %d", basetag, idx);
}
res.roomoffs[type][idx] = 0xFFFFFFFF;
return 0;
@@ -1558,7 +1558,7 @@
}
}
- debug(1, "Total allocated size=%d, locked=%d(%d)\n", _allocatedSize, lockedSize, lockedNum);
+ debug(1, "Total allocated size=%d, locked=%d(%d)", _allocatedSize, lockedSize, lockedNum);
}
void Scumm::readMAXS() {
@@ -1671,7 +1671,7 @@
_inventory = (uint16 *)calloc(_numInventory, sizeof(uint16));
_verbs = (VerbSlot *)calloc(_numVerbs, sizeof(VerbSlot));
_objs = (ObjectData *)calloc(_numLocalObjects, sizeof(ObjectData));
- debug(2, "Allocated %d space in numObjects\n", _numLocalObjects);
+ debug(2, "Allocated %d space in numObjects", _numLocalObjects);
_scummVars = (int32 *)calloc(_numVariables, sizeof(int32));
_bitVars = (byte *)calloc(_numBitVariables >> 3, 1);
Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- script_v5.cpp 13 Jul 2003 05:07:27 -0000 1.132
+++ script_v5.cpp 13 Jul 2003 16:22:17 -0000 1.133
@@ -1493,7 +1493,7 @@
shutDown();
break;
default:
- error("o5_quitPauseRestart invalid case %d\n", subOp);
+ error("o5_quitPauseRestart invalid case %d", subOp);
}
}
@@ -1813,7 +1813,7 @@
_colorCycle[a - 1].delay = (b != 0) ? 0x4000 / (b * 0x4C) : 0;
break;
default:
- error("o5_roomOps: unknown subopcode %d\n", _opcode & 0x1F);
+ error("o5_roomOps: unknown subopcode %d", _opcode & 0x1F);
}
}
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -d -r1.168 -r1.169
--- script_v6.cpp 6 Jul 2003 23:19:03 -0000 1.168
+++ script_v6.cpp 13 Jul 2003 16:22:17 -0000 1.169
@@ -2165,7 +2165,7 @@
shutDown();
break;
default:
- error("o6_quitPauseRestart invalid case %d\n", subOp);
+ error("o6_quitPauseRestart invalid case %d", subOp);
}
}
@@ -3051,7 +3051,7 @@
}
void Scumm_v6::unknownEA_func(int a, int b, int c, int d, int e) {
- warning("unknownEA_func(%d, %d, %d, %d, %d) stub\n", a, b, c, d, e);
+ warning("unknownEA_func(%d, %d, %d, %d, %d) stub", a, b, c, d, e);
}
void Scumm_v6::o6_localizeArray() {
Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.182
retrieving revision 2.183
diff -u -d -r2.182 -r2.183
--- script_v8.cpp 16 Jun 2003 15:11:24 -0000 2.182
+++ script_v8.cpp 13 Jul 2003 16:22:17 -0000 2.183
@@ -1623,7 +1623,7 @@
if (x != 0x7FFFFFFF) {
od->x_pos = x;
od->y_pos = y;
- debug(1, "setting position: 0x%X b 0x%X\n", x, y);
+ debug(1, "setting position: 0x%X b 0x%X", x, y);
}
addObjectToDrawQue(objnum);
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- string.cpp 12 Jul 2003 12:23:43 -0000 1.144
+++ string.cpp 13 Jul 2003 16:22:17 -0000 1.145
@@ -274,7 +274,7 @@
_charset->setColor(color);
break;
case 13:
- warning("CHARSET_1: Unknown opcode 13 %d\n", READ_LE_UINT16(buffer));
+ warning("CHARSET_1: Unknown opcode 13 %d", READ_LE_UINT16(buffer));
buffer += 2;
break;
case 14: {
More information about the Scummvm-git-logs
mailing list