diff options
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/actor.cpp | 2 | ||||
| -rw-r--r-- | scumm/charset.cpp | 4 | ||||
| -rw-r--r-- | scumm/imuse_digi.cpp | 2 | ||||
| -rw-r--r-- | scumm/resource.cpp | 6 | ||||
| -rw-r--r-- | scumm/script_v5.cpp | 4 | ||||
| -rw-r--r-- | scumm/script_v6.cpp | 4 | ||||
| -rw-r--r-- | scumm/script_v8.cpp | 2 | ||||
| -rw-r--r-- | scumm/string.cpp | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index 8dfca3c00f..444188e7a8 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -1426,7 +1426,7 @@ void Actor::walkActorOld() { 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; } diff --git a/scumm/charset.cpp b/scumm/charset.cpp index 0c76eb799a..40ee479ef2 100644 --- a/scumm/charset.cpp +++ b/scumm/charset.cpp @@ -55,7 +55,7 @@ void CharsetRendererCommon::setCurID(byte id) { _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 @@ void CharsetRendererV3::setCurID(byte id) { _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; diff --git a/scumm/imuse_digi.cpp b/scumm/imuse_digi.cpp index e182a650e9..d320673e32 100644 --- a/scumm/imuse_digi.cpp +++ b/scumm/imuse_digi.cpp @@ -1114,7 +1114,7 @@ int32 IMuseDigital::doCommand(int a, int b, int c, int d, int e, int f, int g, i 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: diff --git a/scumm/resource.cpp b/scumm/resource.cpp index 8b9087c35b..2be823488a 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -886,7 +886,7 @@ int Scumm::readSoundResource(int type, int idx) { 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 @@ void Scumm::resourceStats() { } } - 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 @@ void Scumm::allocateArrays() { _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); diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index 3a217c65d1..0d77cef1d3 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -1493,7 +1493,7 @@ void Scumm_v5::o5_quitPauseRestart() { shutDown(); break; default: - error("o5_quitPauseRestart invalid case %d\n", subOp); + error("o5_quitPauseRestart invalid case %d", subOp); } } @@ -1813,7 +1813,7 @@ void Scumm_v5::o5_roomOps() { _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); } } diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index cd4602fc93..6d2f38463c 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -2165,7 +2165,7 @@ void Scumm_v6::o6_quitPauseRestart() { 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::o6_unknownEA() { } 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() { diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp index e2c442cf52..9edac12f6c 100644 --- a/scumm/script_v8.cpp +++ b/scumm/script_v8.cpp @@ -1623,7 +1623,7 @@ void Scumm_v8::o8_drawObject() { 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); diff --git a/scumm/string.cpp b/scumm/string.cpp index 7addac9254..3196dbd04c 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -274,7 +274,7 @@ void Scumm::CHARSET_1() { _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: { |