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

[lordhoto at users.sourceforge.net]

Revision: 41297
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41297&view=rev
Author:   lordhoto
Date:     2009-06-06 19:47:55 +0000 (Sat, 06 Jun 2009)

Log Message:
-----------
Use GameDescriptor::setGUIOptions instead of setting key "guioptions" directly.

Modified Paths:
--------------
    scummvm/trunk/engines/advancedDetector.cpp
    scummvm/trunk/engines/scumm/detection.cpp

Modified: scummvm/trunk/engines/advancedDetector.cpp
===================================================================
--- scummvm/trunk/engines/advancedDetector.cpp	2009-06-06 19:20:39 UTC (rev 41296)
+++ scummvm/trunk/engines/advancedDetector.cpp	2009-06-06 19:47:55 UTC (rev 41297)
@@ -198,8 +198,7 @@
 	if (params.flags & kADFlagUseExtraAsHint)
 		desc["extra"] = realDesc->extra;
 
-	if ((realDesc->guioptions | params.guioptions) != 0)
-		desc["guioptions"] = Common::getGameGUIOptionsDescription(realDesc->guioptions | params.guioptions);
+	desc.setGUIOptions(realDesc->guioptions | params.guioptions);
 }
 
 GameList AdvancedMetaEngine::detectGames(const Common::FSList &fslist) const {

Modified: scummvm/trunk/engines/scumm/detection.cpp
===================================================================
--- scummvm/trunk/engines/scumm/detection.cpp	2009-06-06 19:20:39 UTC (rev 41296)
+++ scummvm/trunk/engines/scumm/detection.cpp	2009-06-06 19:47:55 UTC (rev 41297)
@@ -765,8 +765,7 @@
 
 		dg["preferredtarget"] = res;
 
-		if (x->game.guioptions != 0)
-			dg["guioptions"] = Common::getGameGUIOptionsDescription(x->game.guioptions);
+		dg.setGUIOptions(x->game.guioptions);
 
 		detectedGames.push_back(dg);
 	}


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