From c0d54bdd8dcd2235a0258af145fe2528c07c9fc2 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 29 Feb 2012 12:57:34 +0100
Subject: COMMON: Move language GUIO code to language.h

---
 common/gui_options.cpp | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'common/gui_options.cpp')

diff --git a/common/gui_options.cpp b/common/gui_options.cpp
index 5b7d939dc4..32a7cc9c41 100644
--- a/common/gui_options.cpp
+++ b/common/gui_options.cpp
@@ -79,23 +79,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;
 
-- 
cgit v1.2.3


From 82ab3056fa52f78309ae3271114dbec28ceb9684 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Wed, 29 Feb 2012 16:48:25 +0100
Subject: ENGINES: Implement per-game options caching in AdvancedDetector via
 GUIO flags.

---
 common/gui_options.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'common/gui_options.cpp')

diff --git a/common/gui_options.cpp b/common/gui_options.cpp
index 32a7cc9c41..59fbfb38d1 100644
--- a/common/gui_options.cpp
+++ b/common/gui_options.cpp
@@ -64,6 +64,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 }
 };
 
-- 
cgit v1.2.3


From 346c1fe46120ef89348971a55b0181ca37d0582b Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 25 Mar 2012 18:51:23 +0300
Subject: GUI: Change the undithering checkbox to be an engine-specific option

---
 common/gui_options.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'common/gui_options.cpp')

diff --git a/common/gui_options.cpp b/common/gui_options.cpp
index 59fbfb38d1..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" },
-- 
cgit v1.2.3