[Scummvm-cvs-logs] SF.net SVN: scummvm: [20750] scummvm/trunk/gui/launcher.cpp

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sat Feb 18 03:13:02 CET 2006


Revision: 20750
Author:   fingolfin
Date:     2006-02-18 03:12:08 -0800 (Sat, 18 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20750&view=rev

Log Message:
-----------
EditGameDialog only needs the game description, not the full GameSettings -> changing constructor accordingly

Modified Paths:
--------------
    scummvm/trunk/gui/launcher.cpp
Modified: scummvm/trunk/gui/launcher.cpp
===================================================================
--- scummvm/trunk/gui/launcher.cpp	2006-02-18 01:04:58 UTC (rev 20749)
+++ scummvm/trunk/gui/launcher.cpp	2006-02-18 11:12:08 UTC (rev 20750)
@@ -114,7 +114,7 @@
 	typedef Common::String String;
 	typedef Common::StringList StringList;
 public:
-	EditGameDialog(const String &domain, GameSettings target);
+	EditGameDialog(const String &domain, const char *desc);
 
 	void open();
 	void close();
@@ -137,7 +137,7 @@
 	CheckboxWidget *_globalVolumeOverride;
 };
 
-EditGameDialog::EditGameDialog(const String &domain, GameSettings target)
+EditGameDialog::EditGameDialog(const String &domain, const char *desc)
 	: OptionsDialog(domain, 10, 40, 320 - 2 * 10, 140) {
 
 	const int screenW = g_system->getOverlayWidth();
@@ -176,8 +176,8 @@
 
 	// GAME: Determine the description string
 	String description(ConfMan.get("description", domain));
-	if (description.isEmpty() && target.description) {
-		description = target.description;
+	if (description.isEmpty() && desc) {
+		description = desc;
 	}
 
 	// GUI:  Add tab widget
@@ -714,7 +714,7 @@
 			}
 
 			// Display edit dialog for the new entry
-			EditGameDialog editDialog(domain, result);
+			EditGameDialog editDialog(domain, result.description);
 			if (editDialog.runModal() > 0) {
 				// User pressed OK, so make changes permanent
 
@@ -761,7 +761,7 @@
 	String gameId(ConfMan.get("gameid", _domains[item]));
 	if (gameId.isEmpty())
 		gameId = _domains[item];
-	EditGameDialog editDialog(_domains[item], GameDetector::findGame(gameId));
+	EditGameDialog editDialog(_domains[item], GameDetector::findGame(gameId).description);
 	if (editDialog.runModal() > 0) {
 		// User pressed OK, so make changes permanent
 







More information about the Scummvm-git-logs mailing list