From 9a350f43980d82ec001c077b28c035350478fe8e Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 1 Nov 2010 16:04:47 +0000 Subject: ENGINES: Get rid of some (f)printfs svn-id: r54011 --- engines/agi/loader_v2.cpp | 1 - engines/lure/debugger.cpp | 1 - engines/sci/engine/segment.cpp | 2 -- engines/tinsel/coroutine.cpp | 6 +++--- engines/tinsel/heapmem.cpp | 2 +- engines/tinsel/music.cpp | 2 +- engines/tinsel/object.cpp | 2 +- engines/tinsel/palette.cpp | 4 ++-- engines/tinsel/sched.cpp | 2 +- engines/toon/character.cpp | 6 +++--- 10 files changed, 12 insertions(+), 16 deletions(-) diff --git a/engines/agi/loader_v2.cpp b/engines/agi/loader_v2.cpp index 54b40d66b2..8780e1dab8 100644 --- a/engines/agi/loader_v2.cpp +++ b/engines/agi/loader_v2.cpp @@ -158,7 +158,6 @@ uint8 *AgiLoader_v2::loadVolRes(struct AgiDir *agid) { } } else { warning("AgiLoader_v2::loadVolRes: bad signature %04x", sig); - // fprintf (stderr, "ACK! BAD RESOURCE!!!\n"); return 0; } fp.close(); diff --git a/engines/lure/debugger.cpp b/engines/lure/debugger.cpp index 5fbe124919..9ce6331db9 100644 --- a/engines/lure/debugger.cpp +++ b/engines/lure/debugger.cpp @@ -23,7 +23,6 @@ * */ - #include "common/config-manager.h" #include "common/endian.h" #include "lure/luredefs.h" diff --git a/engines/sci/engine/segment.cpp b/engines/sci/engine/segment.cpp index b16dd5a5e5..8ae063c629 100644 --- a/engines/sci/engine/segment.cpp +++ b/engines/sci/engine/segment.cpp @@ -318,10 +318,8 @@ reg_t DataStack::findCanonicAddress(SegManager *segMan, reg_t addr) const { Common::Array DataStack::listAllOutgoingReferences(reg_t object) const { Common::Array tmp; - fprintf(stderr, "Emitting %d stack entries\n", _capacity); for (int i = 0; i < _capacity; i++) tmp.push_back(_entries[i]); - fprintf(stderr, "DONE"); return tmp; } diff --git a/engines/tinsel/coroutine.cpp b/engines/tinsel/coroutine.cpp index a1871f90b0..72f39bb21e 100644 --- a/engines/tinsel/coroutine.cpp +++ b/engines/tinsel/coroutine.cpp @@ -47,7 +47,7 @@ static void changeCoroStats(const char *func, int change) { } static void displayCoroStats() { - printf("%d active coros\n", s_coroCount); + debug("%d active coros", s_coroCount); // Loop over s_coroFuncs and print info about active coros if (!s_coroFuncs) @@ -55,7 +55,7 @@ static void displayCoroStats() { for (CoroHashMap::const_iterator it = s_coroFuncs->begin(); it != s_coroFuncs->end(); ++it) { if (it->_value != 0) - printf(" %3d x %s\n", it->_value, it->_key.c_str()); + debug(" %3d x %s", it->_value, it->_key.c_str()); } } @@ -75,7 +75,7 @@ CoroBaseContext::~CoroBaseContext() { #if COROUTINE_DEBUG s_coroCount--; changeCoroStats(_funcName, -1); - printf("Deleting coro in %s at %p (subctx %p)\n ", + debug("Deleting coro in %s at %p (subctx %p)", _funcName, (void *)this, (void *)_subctx); displayCoroStats(); #endif diff --git a/engines/tinsel/heapmem.cpp b/engines/tinsel/heapmem.cpp index fa05c3717b..83bbf6affa 100644 --- a/engines/tinsel/heapmem.cpp +++ b/engines/tinsel/heapmem.cpp @@ -94,7 +94,7 @@ static void MemoryStats() { } } - printf("%d nodes used, %d alloced, %d locked; %d bytes locked, %d used\n", + debug("%d nodes used, %d alloced, %d locked; %d bytes locked, %d used", usedNodes, allocedNodes, lockedNodes, lockedSize, totalSize); } #endif diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp index 9560624e05..f21c41a843 100644 --- a/engines/tinsel/music.cpp +++ b/engines/tinsel/music.cpp @@ -382,7 +382,7 @@ void OpenMidiFiles() { assert(curTrack < ARRAYSIZE(midiOffsets)); midiOffsets[curTrack] = curOffset + (4 * curTrack); - //printf("%d: %d\n", curTrack, midiOffsets[curTrack]); + //debug("%d: %d", curTrack, midiOffsets[curTrack]); songLength = midiStream.readUint32LE(); curOffset += songLength; diff --git a/engines/tinsel/object.cpp b/engines/tinsel/object.cpp index 7a93a0b30a..b67d20fa93 100644 --- a/engines/tinsel/object.cpp +++ b/engines/tinsel/object.cpp @@ -94,7 +94,7 @@ void KillAllObjects() { */ void ObjectStats() { - printf("%i objects of %i used.\n", maxObj, NUM_OBJECTS); + debug("%i objects of %i used", maxObj, NUM_OBJECTS); } #endif diff --git a/engines/tinsel/palette.cpp b/engines/tinsel/palette.cpp index ec518d9e68..528adcd048 100644 --- a/engines/tinsel/palette.cpp +++ b/engines/tinsel/palette.cpp @@ -198,8 +198,8 @@ void ResetPalAllocator() { * Shows the maximum number of palettes used at once. */ void PaletteStats() { - printf("%i palettes of %i used.\n", maxPals, NUM_PALETTES); - printf("%i DAC queue entries of %i used.\n", maxDACQ, VDACQLENGTH); + debug("%i palettes of %i used", maxPals, NUM_PALETTES); + debug("%i DAC queue entries of %i used", maxDACQ, VDACQLENGTH); } #endif diff --git a/engines/tinsel/sched.cpp b/engines/tinsel/sched.cpp index 97e41e2a7d..08a68d2d4a 100644 --- a/engines/tinsel/sched.cpp +++ b/engines/tinsel/sched.cpp @@ -132,7 +132,7 @@ void Scheduler::reset() { * Shows the maximum number of process used at once. */ void Scheduler::printStats() { - printf("%i process of %i used.\n", maxProcs, NUM_PROCESS); + debug("%i process of %i used", maxProcs, NUM_PROCESS); } #endif diff --git a/engines/toon/character.cpp b/engines/toon/character.cpp index f6e244a064..e4cb48050e 100644 --- a/engines/toon/character.cpp +++ b/engines/toon/character.cpp @@ -443,11 +443,11 @@ void Character::update(int32 timeIncrement) { #if 0 if (_id == 0) - printf(" drew animation name %s / flag %d / frame %d \n", _specialAnim->_name, _animFlags, nextFrame); + debug(" drew animation name %s / flag %d / frame %d", _specialAnim->_name, _animFlags, nextFrame); if (_id == 1) - debugC(0, 0xfff, " flux animation flag %d / frame %d", _animFlags, nextFrame); + debug(" flux animation flag %d / frame %d", _animFlags, nextFrame); if (_id == 7) - debugC(0, 0xfff, " footman animation flag %d / frame %d", _animFlags, nextFrame); + debug(" footman animation flag %d / frame %d", _animFlags, nextFrame); #endif _time = nextTime; -- cgit v1.2.3