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

[fingolfin at users.sourceforge.net]

Revision: 24686
          http://svn.sourceforge.net/scummvm/?rev=24686&view=rev
Author:   fingolfin
Date:     2006-11-11 19:26:44 -0800 (Sat, 11 Nov 2006)

Log Message:
-----------
Since we now generate warnings/messages for engine instantiation failures in a central place, get rid of such messages printed by engines

Modified Paths:
--------------
    scummvm/trunk/engines/agi/agi.cpp
    scummvm/trunk/engines/scumm/plugin.cpp
    scummvm/trunk/engines/sword2/sword2.cpp
    scummvm/trunk/engines/touche/plugin.cpp

Modified: scummvm/trunk/engines/agi/agi.cpp
===================================================================
--- scummvm/trunk/engines/agi/agi.cpp	2006-11-12 03:23:29 UTC (rev 24685)
+++ scummvm/trunk/engines/agi/agi.cpp	2006-11-12 03:26:44 UTC (rev 24686)
@@ -642,7 +642,6 @@
 	FSList fslist;
 	FilesystemNode dir(ConfMan.get("path"));
 	if (!dir.listDir(fslist, FilesystemNode::kListFilesOnly)) {
-		warning("AgiEngine: invalid game path '%s'", dir.path().c_str());
 		return kInvalidPathError;
 	}
 
@@ -657,7 +656,6 @@
 		}
 	}
 
-	warning("AgiEngine: Unable to locate game data at path '%s'", dir.path().c_str());
 	return kNoGameDataFoundError;
 }
 

Modified: scummvm/trunk/engines/scumm/plugin.cpp
===================================================================
--- scummvm/trunk/engines/scumm/plugin.cpp	2006-11-12 03:23:29 UTC (rev 24685)
+++ scummvm/trunk/engines/scumm/plugin.cpp	2006-11-12 03:26:44 UTC (rev 24686)
@@ -1410,7 +1410,6 @@
 	FSList fslist;
 	FilesystemNode dir(ConfMan.get("path"));
 	if (!dir.listDir(fslist, FilesystemNode::kListFilesOnly)) {
-		warning("ScummEngine: invalid game path '%s'", dir.path().c_str());
 		return kInvalidPathError;
 	}
 
@@ -1421,7 +1420,6 @@
 
 	// Unable to locate game data
 	if (results.empty()) {
-		warning("ScummEngine: unable to locate game data at path '%s'", dir.path().c_str());
 		return kNoGameDataFoundError;
 	}
 	

Modified: scummvm/trunk/engines/sword2/sword2.cpp
===================================================================
--- scummvm/trunk/engines/sword2/sword2.cpp	2006-11-12 03:23:29 UTC (rev 24685)
+++ scummvm/trunk/engines/sword2/sword2.cpp	2006-11-12 03:26:44 UTC (rev 24686)
@@ -113,7 +113,6 @@
 	FSList fslist;
 	FilesystemNode dir(ConfMan.get("path"));
 	if (!dir.listDir(fslist, FilesystemNode::kListFilesOnly)) {
-		warning("Sword2Engine: invalid game path '%s'", dir.path().c_str());
 		return kInvalidPathError;
 	}
 
@@ -128,7 +127,6 @@
 		}
 	}
 
-	warning("Sword2Engine: Unable to locate game data at path '%s'", dir.path().c_str());
 	return kNoGameDataFoundError;
 }
 

Modified: scummvm/trunk/engines/touche/plugin.cpp
===================================================================
--- scummvm/trunk/engines/touche/plugin.cpp	2006-11-12 03:23:29 UTC (rev 24685)
+++ scummvm/trunk/engines/touche/plugin.cpp	2006-11-12 03:26:44 UTC (rev 24686)
@@ -138,12 +138,10 @@
 	FSList fslist;
 	FilesystemNode dir(ConfMan.get("path"));
 	if (!dir.listDir(fslist, FilesystemNode::kListFilesOnly)) {
-		warning("ToucheEngine: invalid game path '%s'", dir.path().c_str());
 		return kInvalidPathError;
 	}
 	DetectedGameList game = Engine_TOUCHE_detectGames(fslist);
 	if (game.size() != 1) {
-		warning("ToucheEngine: Unable to locate game data in '%s'", dir.path().c_str());
 		return kNoGameDataFoundError;
 	}
 	assert(engine);


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