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

[sev at users.sourceforge.net]

Revision: 41277
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41277&view=rev
Author:   sev
Date:     2009-06-06 17:59:04 +0000 (Sat, 06 Jun 2009)

Log Message:
-----------
Disable load from the launcher button for AGOS and Gob games with use of GUI options

Modified Paths:
--------------
    scummvm/trunk/engines/agos/detection.cpp
    scummvm/trunk/engines/gob/detection.cpp
    scummvm/trunk/gui/launcher.cpp

Modified: scummvm/trunk/engines/agos/detection.cpp
===================================================================
--- scummvm/trunk/engines/agos/detection.cpp	2009-06-06 17:58:29 UTC (rev 41276)
+++ scummvm/trunk/engines/agos/detection.cpp	2009-06-06 17:59:04 UTC (rev 41277)
@@ -100,7 +100,7 @@
 	// Flags
 	0,
 	// Additional GUI options (for every game}
-	Common::GUIO_NONE
+	Common::GUIO_NOLAUNCHLOAD
 };
 
 using namespace AGOS;

Modified: scummvm/trunk/engines/gob/detection.cpp
===================================================================
--- scummvm/trunk/engines/gob/detection.cpp	2009-06-06 17:58:29 UTC (rev 41276)
+++ scummvm/trunk/engines/gob/detection.cpp	2009-06-06 17:59:04 UTC (rev 41277)
@@ -3677,7 +3677,7 @@
 	// Flags
 	0,
 	// Additional GUI options (for every game}
-	Common::GUIO_NONE
+	Common::GUIO_NOLAUNCHLOAD
 };
 
 class GobMetaEngine : public AdvancedMetaEngine {

Modified: scummvm/trunk/gui/launcher.cpp
===================================================================
--- scummvm/trunk/gui/launcher.cpp	2009-06-06 17:58:29 UTC (rev 41276)
+++ scummvm/trunk/gui/launcher.cpp	2009-06-06 17:59:04 UTC (rev 41277)
@@ -948,8 +948,15 @@
 		_removeButton->setEnabled(enable);
 		_removeButton->draw();
 	}
-	if (enable != _loadButton->isEnabled()) {
-		_loadButton->setEnabled(enable);
+
+	int item = _list->getSelected();
+	bool en = enable;
+
+	if (item >= 0)
+		en = !(Common::checkGameGUIOption(Common::GUIO_NOLAUNCHLOAD, ConfMan.get("guioptions", _domains[item])));
+
+	if (en != _loadButton->isEnabled()) {
+		_loadButton->setEnabled(en);
 		_loadButton->draw();
 	}
 


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