Merge branch 'master'

Conflicts:
	configure
	base/plugins.cpp

1 files changed, 8 insertions, 18 deletions

diff --git a/common/gui_options.cpp b/common/gui_options.cpp
index 5b7d939dc4..e463232276 100644
--- a/common/gui_options.cpp
+++ b/common/gui_options.cpp
@@ -52,7 +52,6 @@ const struct GameOpt {
 	{ GUIO_MIDIGM,       "midiGM" },
 
 	{ GUIO_NOASPECT,     "noAspect" },
-	{ GUIO_EGAUNDITHER,  "egaUndither" },
 
 	{ GUIO_RENDERHERCGREEN,	"hercGreen" },
 	{ GUIO_RENDERHERCAMBER,	"hercAmber" },
@@ -64,6 +63,14 @@ const struct GameOpt {
 	{ GUIO_RENDERPC9821,	"pc9821" },
 	{ GUIO_RENDERPC9801,	"pc9801" },
 
+	{ GUIO_GAMEOPTIONS1, "gameOption1" },
+	{ GUIO_GAMEOPTIONS2, "gameOption2" },
+	{ GUIO_GAMEOPTIONS3, "gameOption3" },
+	{ GUIO_GAMEOPTIONS4, "gameOption4" },
+	{ GUIO_GAMEOPTIONS5, "gameOption5" },
+	{ GUIO_GAMEOPTIONS6, "gameOption6" },
+	{ GUIO_GAMEOPTIONS7, "gameOption7" },
+
 	{ GUIO_NONE, 0 }
 };
 
@@ -79,23 +86,6 @@ bool checkGameGUIOption(const String &option, const String &str) {
 	return false;
 }
 
-bool checkGameGUIOptionLanguage(Language lang, const String &str) {
-	if (!str.contains("lang_")) // If no languages are specified
-		return true;
-
-	if (str.contains(getGameGUIOptionsDescriptionLanguage(lang)))
-		return true;
-
-	return false;
-}
-
-const String getGameGUIOptionsDescriptionLanguage(Language lang) {
-	if (lang == UNK_LANG)
-		return "";
-
-	return String("lang_") + getLanguageDescription(lang);
-}
-
 String parseGameGUIOptions(const String &str) {
 	String res;