[Scummvm-cvs-logs] SF.net SVN: scummvm: [21566] scummvm/trunk/base/gameDetector.cpp

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sun Apr 2 13:44:06 CEST 2006


Revision: 21566
Author:   fingolfin
Date:     2006-04-02 13:43:36 -0700 (Sun, 02 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21566&view=rev

Log Message:
-----------
Compute the value GameDetector::_gameid *immediately* after _targetName has been set (this ensures that both are always in sync)

Modified Paths:
--------------
    scummvm/trunk/base/gameDetector.cpp
Modified: scummvm/trunk/base/gameDetector.cpp
===================================================================
--- scummvm/trunk/base/gameDetector.cpp	2006-04-02 20:29:54 UTC (rev 21565)
+++ scummvm/trunk/base/gameDetector.cpp	2006-04-02 20:43:36 UTC (rev 21566)
@@ -651,6 +651,11 @@
 void GameDetector::setTarget(const String &target) {
 	_targetName = target;
 	ConfMan.setActiveDomain(target);
+
+	if (ConfMan.hasKey("gameid"))
+		_gameid = ConfMan.get("gameid");
+	else
+		_gameid = _targetName;
 }
 
 bool GameDetector::detectMain() {
@@ -659,11 +664,6 @@
 		return false;
 	}
 
-	if (ConfMan.hasKey("gameid"))
-		_gameid = ConfMan.get("gameid");
-	else
-		_gameid = _targetName;
-
 	printf("Looking for %s\n", _gameid.c_str());
 	GameDescriptor game = findGame(_gameid, &_plugin);
 


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