[Scummvm-cvs-logs] SF.net SVN: scummvm:[54011] scummvm/trunk/engines

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Mon Nov 1 17:04:47 CET 2010


Revision: 54011
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54011&view=rev
Author:   fingolfin
Date:     2010-11-01 16:04:47 +0000 (Mon, 01 Nov 2010)

Log Message:
-----------
ENGINES: Get rid of some (f)printfs

Modified Paths:
--------------
    scummvm/trunk/engines/agi/loader_v2.cpp
    scummvm/trunk/engines/lure/debugger.cpp
    scummvm/trunk/engines/sci/engine/segment.cpp
    scummvm/trunk/engines/tinsel/coroutine.cpp
    scummvm/trunk/engines/tinsel/heapmem.cpp
    scummvm/trunk/engines/tinsel/music.cpp
    scummvm/trunk/engines/tinsel/object.cpp
    scummvm/trunk/engines/tinsel/palette.cpp
    scummvm/trunk/engines/tinsel/sched.cpp
    scummvm/trunk/engines/toon/character.cpp

Modified: scummvm/trunk/engines/agi/loader_v2.cpp
===================================================================
--- scummvm/trunk/engines/agi/loader_v2.cpp	2010-11-01 16:04:18 UTC (rev 54010)
+++ scummvm/trunk/engines/agi/loader_v2.cpp	2010-11-01 16:04:47 UTC (rev 54011)
@@ -158,7 +158,6 @@
 			}
 		} else {
 			warning("AgiLoader_v2::loadVolRes: bad signature %04x", sig);
-			// fprintf (stderr, "ACK! BAD RESOURCE!!!\n");
 			return 0;
 		}
 		fp.close();

Modified: scummvm/trunk/engines/lure/debugger.cpp
===================================================================
--- scummvm/trunk/engines/lure/debugger.cpp	2010-11-01 16:04:18 UTC (rev 54010)
+++ scummvm/trunk/engines/lure/debugger.cpp	2010-11-01 16:04:47 UTC (rev 54011)
@@ -23,7 +23,6 @@
  *
  */
 
-
 #include "common/config-manager.h"
 #include "common/endian.h"
 #include "lure/luredefs.h"

Modified: scummvm/trunk/engines/sci/engine/segment.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/segment.cpp	2010-11-01 16:04:18 UTC (rev 54010)
+++ scummvm/trunk/engines/sci/engine/segment.cpp	2010-11-01 16:04:47 UTC (rev 54011)
@@ -318,10 +318,8 @@
 
 Common::Array<reg_t> DataStack::listAllOutgoingReferences(reg_t object) const {
 	Common::Array<reg_t> 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;
 }

Modified: scummvm/trunk/engines/tinsel/coroutine.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/coroutine.cpp	2010-11-01 16:04:18 UTC (rev 54010)
+++ scummvm/trunk/engines/tinsel/coroutine.cpp	2010-11-01 16:04:47 UTC (rev 54011)
@@ -47,7 +47,7 @@
 }
 
 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 @@
 	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 @@
 #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

Modified: scummvm/trunk/engines/tinsel/heapmem.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/heapmem.cpp	2010-11-01 16:04:18 UTC (rev 54010)
+++ scummvm/trunk/engines/tinsel/heapmem.cpp	2010-11-01 16:04:47 UTC (rev 54011)
@@ -94,7 +94,7 @@
 		}
 	}
 
-	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

Modified: scummvm/trunk/engines/tinsel/music.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/music.cpp	2010-11-01 16:04:18 UTC (rev 54010)
+++ scummvm/trunk/engines/tinsel/music.cpp	2010-11-01 16:04:47 UTC (rev 54011)
@@ -382,7 +382,7 @@
 
 		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;

Modified: scummvm/trunk/engines/tinsel/object.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/object.cpp	2010-11-01 16:04:18 UTC (rev 54010)
+++ scummvm/trunk/engines/tinsel/object.cpp	2010-11-01 16:04:47 UTC (rev 54011)
@@ -94,7 +94,7 @@
  */
 
 void ObjectStats() {
-	printf("%i objects of %i used.\n", maxObj, NUM_OBJECTS);
+	debug("%i objects of %i used", maxObj, NUM_OBJECTS);
 }
 #endif
 

Modified: scummvm/trunk/engines/tinsel/palette.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/palette.cpp	2010-11-01 16:04:18 UTC (rev 54010)
+++ scummvm/trunk/engines/tinsel/palette.cpp	2010-11-01 16:04:47 UTC (rev 54011)
@@ -198,8 +198,8 @@
  * 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
 

Modified: scummvm/trunk/engines/tinsel/sched.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/sched.cpp	2010-11-01 16:04:18 UTC (rev 54010)
+++ scummvm/trunk/engines/tinsel/sched.cpp	2010-11-01 16:04:47 UTC (rev 54011)
@@ -132,7 +132,7 @@
  * 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
 

Modified: scummvm/trunk/engines/toon/character.cpp
===================================================================
--- scummvm/trunk/engines/toon/character.cpp	2010-11-01 16:04:18 UTC (rev 54010)
+++ scummvm/trunk/engines/toon/character.cpp	2010-11-01 16:04:47 UTC (rev 54011)
@@ -443,11 +443,11 @@
 	
 #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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list