[Scummvm-cvs-logs] CVS: scummvm/gui launcher.cpp,1.58,1.59

[Max Horn]

Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv20245/gui

Modified Files:
	launcher.cpp 
Log Message:
cleanup: removed version/id from GameSettings

Index: launcher.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/launcher.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- launcher.cpp	17 Oct 2003 15:54:17 -0000	1.58
+++ launcher.cpp	28 Oct 2003 17:07:23 -0000	1.59
@@ -100,10 +100,6 @@
 		description = target.description;
 	}
 
-	// Determine whether this is a SCUMM game
-	// FIXME: This check is evil, as it requires us to hard code GIDs.
-	bool isScumm = (GID_SCUMM_FIRST <= target.id && target.id <= GID_SCUMM_LAST);
-
 	
 	// Label & edit widget for the game ID
 	new StaticTextWidget(this, 10, 10, 40, kLineHeight, "ID: ", kTextAlignRight);
@@ -124,6 +120,14 @@
 	_fullscreenCheckbox = new CheckboxWidget(this, 15, 62, 200, 16, "Use Fullscreen Mode", 0, 'F');
 	_fullscreenCheckbox->setState(ConfMan.getBool("fullscreen", _domain));
 
+/*
+	// FIXME: The amiga checkbox is outdated cruft. It should be replaced by a
+	// a "platform" popup.
+
+	// Determine whether this is a SCUMM game
+	// FIXME: This check is evil, as it requires us to hard code GIDs.
+	bool isScumm = (GID_SCUMM_FIRST <= target.id && target.id <= GID_SCUMM_LAST);
+
 	// Display 'Amiga' checkbox, but only for Scumm games.
 	if (isScumm) {
 		_amigaCheckbox = new CheckboxWidget(this, 15, 82, 200, 16, "Amiga Version", 0, 'A');
@@ -131,7 +135,7 @@
 	} else {
 		_amigaCheckbox = 0;
 	}
-
+*/
 	// Add OK & Cancel buttons
 	addButton(_w - 2 * (kButtonWidth + 10), _h - 24, "Cancel", kCloseCmd, 0);
 	addButton(_w - (kButtonWidth + 10), _h - 24, "OK", kOKCmd, 0);
@@ -307,7 +311,7 @@
 			// ...so let's determine a list of candidates, games that
 			// could be contained in the specified directory.
 			GameList candidates = detectGames(dir);
-			GameSettings result = {NULL, NULL, 0, 0, MDT_NONE, 0, NULL};
+			GameSettings result = {NULL, NULL, MDT_NONE, 0, NULL};
 
 			if (candidates.isEmpty()) {
 				// No game was found in the specified directory