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

[thebluegr at users.sourceforge.net]

Revision: 44858
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44858&view=rev
Author:   thebluegr
Date:     2009-10-10 00:07:19 +0000 (Sat, 10 Oct 2009)

Log Message:
-----------
Introduced a new debug level, kDebugLevelResMan, and reduced some of the messages printed to the console

Modified Paths:
--------------
    scummvm/trunk/engines/sci/resource.cpp
    scummvm/trunk/engines/sci/sci.cpp
    scummvm/trunk/engines/sci/sci.h

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2009-10-09 23:53:37 UTC (rev 44857)
+++ scummvm/trunk/engines/sci/resource.cpp	2009-10-10 00:07:19 UTC (rev 44858)
@@ -517,8 +517,8 @@
 		_mapVersion = _volVersion;
 	}
 
-	debug("resMan: Detected resource map version %d: %s", _mapVersion, versionDescription(_mapVersion));
-	debug("resMan: Detected volume version %d: %s", _volVersion, versionDescription(_volVersion));
+	debugC(1, kDebugLevelResMan, "resMan: Detected resource map version %d: %s", _mapVersion, versionDescription(_mapVersion));
+	debugC(1, kDebugLevelResMan, "resMan: Detected volume version %d: %s", _volVersion, versionDescription(_volVersion));
 
 	scanNewSources();
 	addInternalSources();
@@ -526,20 +526,20 @@
 
 	detectSciVersion();
 
-	debug("resMan: Detected %s", getSciVersionDesc(getSciVersion()).c_str());
+	debugC(1, kDebugLevelResMan, "resMan: Detected %s", getSciVersionDesc(getSciVersion()).c_str());
 
 	switch (_viewType) {
 	case kViewEga:
-		debug("resMan: Detected EGA graphic resources");
+		debugC(1, kDebugLevelResMan, "resMan: Detected EGA graphic resources");
 		break;
 	case kViewVga:
-		debug("resMan: Detected VGA graphic resources");
+		debugC(1, kDebugLevelResMan, "resMan: Detected VGA graphic resources");
 		break;
 	case kViewVga11:
-		debug("resMan: Detected SCI1.1 VGA graphic resources");
+		debugC(1, kDebugLevelResMan, "resMan: Detected SCI1.1 VGA graphic resources");
 		break;
 	case kViewAmiga:
-		debug("resMan: Detected Amiga graphic resources");
+		debugC(1, kDebugLevelResMan, "resMan: Detected Amiga graphic resources");
 		break;
 	default:
 		warning("resMan: Couldn't determine view type");

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2009-10-09 23:53:37 UTC (rev 44857)
+++ scummvm/trunk/engines/sci/sci.cpp	2009-10-10 00:07:19 UTC (rev 44858)
@@ -86,14 +86,9 @@
 	Common::addDebugChannel(kDebugLevelSci0Pic, "Sci0Pic", "SCI0 pic drawing debugging");
 
 	_gamestate = 0;
-
-	printf("SciEngine::SciEngine\n");
 }
 
 SciEngine::~SciEngine() {
-	// Dispose your resources here
-	printf("SciEngine::~SciEngine\n");
-
 	// Remove all of our debug levels here
 	Common::clearAllDebugChannels();
 
@@ -109,9 +104,6 @@
 	// Create debugger console. It requires GFX to be initialized
 	_console = new Console(this);
 
-	// Additional setup.
-	printf("SciEngine::init\n");
-
 	/* bool end = false;
 	Common::EventManager *em = _system->getEventManager();
 	while (!end) {
@@ -129,7 +121,7 @@
 	_resMan = new ResourceManager();
 
 	if (!_resMan) {
-		printf("No resources found, aborting...\n");
+		warning("No resources found, aborting");
 		return Common::kNoGameDataFoundError;
 	}
 
@@ -197,7 +189,7 @@
 
 	_gamestate->_gui->init(_gamestate->usesOldGfxFunctions());
 
-	printf("Emulating SCI version %s\n", getSciVersionDesc(getSciVersion()).c_str());
+	debug("Emulating SCI version %s\n", getSciVersionDesc(getSciVersion()).c_str());
 
 	game_run(&_gamestate); // Run the game
 

Modified: scummvm/trunk/engines/sci/sci.h
===================================================================
--- scummvm/trunk/engines/sci/sci.h	2009-10-09 23:53:37 UTC (rev 44857)
+++ scummvm/trunk/engines/sci/sci.h	2009-10-10 00:07:19 UTC (rev 44858)
@@ -60,7 +60,8 @@
 	kDebugLevelVM         = 1 << 18,
 	kDebugLevelScripts    = 1 << 19,
 	kDebugLevelGC         = 1 << 20,
-	kDebugLevelSci0Pic    = 1 << 21
+	kDebugLevelSci0Pic    = 1 << 21,
+	kDebugLevelResMan     = 1 << 22
 };
 
 extern const char *versionNames[];


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