[Scummvm-cvs-logs] SF.net SVN: scummvm:[43858] scummvm/trunk/engines/sci/console.cpp

[thebluegr at users.sourceforge.net]

Revision: 43858
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43858&view=rev
Author:   thebluegr
Date:     2009-08-31 20:09:36 +0000 (Mon, 31 Aug 2009)

Log Message:
-----------
Some adjustments to the output of the "selector" and "selectors" console commands

Modified Paths:
--------------
    scummvm/trunk/engines/sci/console.cpp

Modified: scummvm/trunk/engines/sci/console.cpp
===================================================================
--- scummvm/trunk/engines/sci/console.cpp	2009-08-31 18:42:07 UTC (rev 43857)
+++ scummvm/trunk/engines/sci/console.cpp	2009-08-31 20:09:36 UTC (rev 43858)
@@ -425,7 +425,7 @@
 
 	for (uint seeker = 0; seeker < _vm->getKernel()->getSelectorNamesSize(); seeker++) {
 		if (!scumm_stricmp(_vm->getKernel()->getSelectorName(seeker).c_str(), argv[1])) {
-			DebugPrintf("Selector %s found at %03x\n", _vm->getKernel()->getSelectorName(seeker).c_str(), seeker);
+			DebugPrintf("Selector %s found at %03x (%d)\n", _vm->getKernel()->getSelectorName(seeker).c_str(), seeker, seeker);
 			return true;
 		}
 	}
@@ -437,8 +437,13 @@
 
 bool Console::cmdSelectors(int argc, const char **argv) {
 	DebugPrintf("Selector names in numeric order:\n");
+	Common::String selectorName;
 	for (uint seeker = 0; seeker < _vm->getKernel()->getSelectorNamesSize(); seeker++) {
-		DebugPrintf("%03x: %20s | ", seeker, _vm->getKernel()->getSelectorName(seeker).c_str());
+		selectorName = _vm->getKernel()->getSelectorName(seeker);
+		if (selectorName != "BAD SELECTOR")
+			DebugPrintf("%03x: %20s | ", seeker, selectorName.c_str());
+		else
+			continue;
 		if ((seeker % 3) == 2)
 			DebugPrintf("\n");
 	}


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