Merge pull request #1456 from Stevoisiak/AddCountries

Additional Country Filters

Source/Android/assets/Dolphin.ini

@@ -169,9 +169,15 @@ ListGC = True
 ListJap = True
 ListPal = True
 ListUsa = True
+ListAustralia = True
 ListFrance = True
+ListGermany = True
+ListInternational = True
 ListItaly = True
 ListKorea = True
+ListNetherlands = True
+ListRussia = True
+ListSpain = True
 ListTaiwan = True
 ListUnknown = True
 ListSort = 3

Source/Core/Core/ConfigManager.cpp

@@ -274,9 +274,15 @@ void SConfig::SaveGameListSettings(IniFile& ini)
 	gamelist->Set("ListJap", m_ListJap);
 	gamelist->Set("ListPal", m_ListPal);
 	gamelist->Set("ListUsa", m_ListUsa);
+	gamelist->Set("ListAustralia", m_ListAustralia);
 	gamelist->Set("ListFrance", m_ListFrance);
+	gamelist->Set("ListGermany", m_ListGermany);
+	gamelist->Set("ListInternational", m_ListInternational);
 	gamelist->Set("ListItaly", m_ListItaly);
 	gamelist->Set("ListKorea", m_ListKorea);
+	gamelist->Set("ListNetherlands", m_ListNetherlands);
+	gamelist->Set("ListRussia", m_ListRussia);
+	gamelist->Set("ListSpain", m_ListSpain);
 	gamelist->Set("ListTaiwan", m_ListTaiwan);
 	gamelist->Set("ListUnknown", m_ListUnknown);
 	gamelist->Set("ListSort", m_ListSort);
@@ -478,21 +484,27 @@ void SConfig::LoadGameListSettings(IniFile& ini)
 {
 	IniFile::Section* gamelist = ini.GetOrCreateSection("GameList");
 
-	gamelist->Get("ListDrives",       &m_ListDrives,  false);
-	gamelist->Get("ListWad",          &m_ListWad,     true);
-	gamelist->Get("ListWii",          &m_ListWii,     true);
-	gamelist->Get("ListGC",           &m_ListGC,      true);
-	gamelist->Get("ListJap",          &m_ListJap,     true);
-	gamelist->Get("ListPal",          &m_ListPal,     true);
-	gamelist->Get("ListUsa",          &m_ListUsa,     true);
+	gamelist->Get("ListDrives",        &m_ListDrives,  false);
+	gamelist->Get("ListWad",           &m_ListWad,     true);
+	gamelist->Get("ListWii",           &m_ListWii,     true);
+	gamelist->Get("ListGC",            &m_ListGC,      true);
+	gamelist->Get("ListJap",           &m_ListJap,     true);
+	gamelist->Get("ListPal",           &m_ListPal,     true);
+	gamelist->Get("ListUsa",           &m_ListUsa,     true);
 
-	gamelist->Get("ListFrance",       &m_ListFrance,  true);
-	gamelist->Get("ListItaly",        &m_ListItaly,   true);
-	gamelist->Get("ListKorea",        &m_ListKorea,   true);
-	gamelist->Get("ListTaiwan",       &m_ListTaiwan,  true);
-	gamelist->Get("ListUnknown",      &m_ListUnknown, true);
-	gamelist->Get("ListSort",         &m_ListSort,       3);
-	gamelist->Get("ListSortSecondary",&m_ListSort2,  0);
+	gamelist->Get("ListAustralia",     &m_ListAustralia,     true);
+	gamelist->Get("ListFrance",        &m_ListFrance,        true);
+	gamelist->Get("ListGermany",       &m_ListGermany,       true);
+	gamelist->Get("ListInternational", &m_ListInternational, true);
+	gamelist->Get("ListItaly",         &m_ListItaly,         true);
+	gamelist->Get("ListKorea",         &m_ListKorea,         true);
+	gamelist->Get("ListNetherlands",   &m_ListNetherlands,   true);
+	gamelist->Get("ListRussia",        &m_ListRussia,        true);
+	gamelist->Get("ListSpain",         &m_ListSpain,         true);
+	gamelist->Get("ListTaiwan",        &m_ListTaiwan,        true);
+	gamelist->Get("ListUnknown",       &m_ListUnknown,       true);
+	gamelist->Get("ListSort",          &m_ListSort,       3);
+	gamelist->Get("ListSortSecondary", &m_ListSort2,      0);
 
 	// Determines if compressed games display in blue
 	gamelist->Get("ColorCompressed", &m_ColorCompressed, true);

Source/Core/Core/ConfigManager.h

@@ -63,9 +63,15 @@ struct SConfig : NonCopyable
 	bool m_ListPal;
 	bool m_ListUsa;
 	bool m_ListJap;
+	bool m_ListAustralia;
 	bool m_ListFrance;
+	bool m_ListGermany;
+	bool m_ListInternational;
 	bool m_ListItaly;
 	bool m_ListKorea;
+	bool m_ListNetherlands;
+	bool m_ListRussia;
+	bool m_ListSpain;
 	bool m_ListTaiwan;
 	bool m_ListUnknown;
 	int m_ListSort;

Source/Core/Core/CoreParameter.cpp

@@ -172,12 +172,16 @@ bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2)
 				case DiscIO::IVolume::COUNTRY_AUSTRALIA:
 				case DiscIO::IVolume::COUNTRY_EUROPE:
 				case DiscIO::IVolume::COUNTRY_FRANCE:
+				case DiscIO::IVolume::COUNTRY_INTERNATIONAL:
 				case DiscIO::IVolume::COUNTRY_ITALY:
+				case DiscIO::IVolume::COUNTRY_NETHERLANDS:
 				case DiscIO::IVolume::COUNTRY_RUSSIA:
+				case DiscIO::IVolume::COUNTRY_SPAIN:
 					bNTSC = false;
 					Region = EUR_DIR;
 					break;
 
+				case DiscIO::IVolume::COUNTRY_UNKNOWN:
 				default:
 					if (PanicYesNoT("Your GCM/ISO file seems to be invalid (invalid country)."
 								   "\nContinue with PAL region?"))
@@ -250,14 +254,17 @@ bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2)
 					Region = JAP_DIR;
 					break;
 
+				case DiscIO::IVolume::COUNTRY_AUSTRALIA:
 				case DiscIO::IVolume::COUNTRY_EUROPE:
 				case DiscIO::IVolume::COUNTRY_FRANCE:
+				case DiscIO::IVolume::COUNTRY_INTERNATIONAL:
 				case DiscIO::IVolume::COUNTRY_ITALY:
 				case DiscIO::IVolume::COUNTRY_RUSSIA:
 					bNTSC = false;
 					Region = EUR_DIR;
 					break;
 
+				case DiscIO::IVolume::COUNTRY_UNKNOWN:
 				default:
 					bNTSC = false;
 					Region = EUR_DIR;

Source/Core/DiscIO/Volume.h

@@ -34,20 +34,23 @@ public:
 	virtual bool CheckIntegrity() const { return false; }
 	virtual bool IsDiscTwo() const { return false; }
 
+	// Increment CACHE_REVISION if values are changed (ISOFile.cpp)
 	enum ECountry
 	{
 		COUNTRY_EUROPE = 0,
-		COUNTRY_FRANCE,
-		COUNTRY_RUSSIA,
-		COUNTRY_USA,
 		COUNTRY_JAPAN,
-		COUNTRY_KOREA,
-		COUNTRY_ITALY,
-		COUNTRY_TAIWAN,
-		COUNTRY_SDK,
-		COUNTRY_UNKNOWN,
-		COUNTRY_GERMANY,
+		COUNTRY_USA,
 		COUNTRY_AUSTRALIA,
+		COUNTRY_FRANCE,
+		COUNTRY_GERMANY,
+		COUNTRY_INTERNATIONAL,
+		COUNTRY_ITALY,
+		COUNTRY_KOREA,
+		COUNTRY_NETHERLANDS,
+		COUNTRY_RUSSIA,
+		COUNTRY_SPAIN,
+		COUNTRY_TAIWAN,
+		COUNTRY_UNKNOWN,
 		NUMBER_OF_COUNTRIES
 	};
 

Source/Core/DiscIO/VolumeCommon.cpp

@@ -15,24 +15,22 @@ IVolume::ECountry CountrySwitch(u8 CountryCode)
 {
 	switch (CountryCode)
 	{
-		// Region free - fall through to European defaults for now
+		// Region free - Uses European flag as placeholder
 		case 'A':
-
+			return IVolume::COUNTRY_INTERNATIONAL;
 
 		// PAL
-		case 'D': // German
+		case 'D':
 			return IVolume::COUNTRY_GERMANY;
 
 		case 'X': // Used by a couple PAL games
-		case 'Y': // German, french
-
+		case 'Y': // German, French
 		case 'L': // Japanese import to PAL regions
 		case 'M': // Japanese import to PAL regions
-		case 'S': // Spanish-speaking regions
 		case 'P':
 			return IVolume::COUNTRY_EUROPE;
 
-		case 'U': // Australia
+		case 'U':
 			return IVolume::COUNTRY_AUSTRALIA;
 
 		case 'F':
@@ -41,9 +39,15 @@ IVolume::ECountry CountrySwitch(u8 CountryCode)
 		case 'I':
 			return IVolume::COUNTRY_ITALY;
 
+		case 'H':
+			return IVolume::COUNTRY_NETHERLANDS;
+
 		case 'R':
 			return IVolume::COUNTRY_RUSSIA;
 
+		case 'S':
+			return IVolume::COUNTRY_SPAIN;
+
 		// NTSC
 		case 'E':
 		case 'N': // Japanese import to USA and other NTSC regions
@@ -54,13 +58,10 @@ IVolume::ECountry CountrySwitch(u8 CountryCode)
 			return IVolume::COUNTRY_JAPAN;
 
 		case 'K':
-		case 'T': // Korea with English language
 		case 'Q': // Korea with Japanese language
+		case 'T': // Korea with English language
 			return IVolume::COUNTRY_KOREA;
 
-		case 'O':
-			return IVolume::COUNTRY_SDK;
-
 		case 'W':
 			return IVolume::COUNTRY_TAIWAN;
 

Source/Core/DolphinQt/Utils/Resources.cpp

@@ -21,15 +21,20 @@ void Resources::Init()
 	QString dir = QString::fromStdString(File::GetSysDirectory() + "Resources/");
 
 	m_regions.resize(DiscIO::IVolume::NUMBER_OF_COUNTRIES);
-	m_regions[DiscIO::IVolume::COUNTRY_EUROPE].load(dir + SL("Flag_Europe.png"));
-	m_regions[DiscIO::IVolume::COUNTRY_FRANCE].load(dir + SL("Flag_France.png"));
-	m_regions[DiscIO::IVolume::COUNTRY_RUSSIA].load(dir + SL("Flag_Unknown.png")); // TODO
-	m_regions[DiscIO::IVolume::COUNTRY_USA].load(dir + SL("Flag_USA.png"));
 	m_regions[DiscIO::IVolume::COUNTRY_JAPAN].load(dir + SL("Flag_Japan.png"));
-	m_regions[DiscIO::IVolume::COUNTRY_KOREA].load(dir + SL("Flag_Korea.png"));
+	m_regions[DiscIO::IVolume::COUNTRY_EUROPE].load(dir + SL("Flag_Europe.png"));
+	m_regions[DiscIO::IVolume::COUNTRY_USA].load(dir + SL("Flag_USA.png"));
+
+	m_regions[DiscIO::IVolume::COUNTRY_AUSTRALIA].load(dir + SL("Flag_Australia.png"));
+	m_regions[DiscIO::IVolume::COUNTRY_FRANCE].load(dir + SL("Flag_France.png"));
+	m_regions[DiscIO::IVolume::COUNTRY_GERMANY].load(dir + SL("Flag_Germany.png"));
+	m_regions[DiscIO::IVolume::COUNTRY_INTERNATIONAL].load(dir + SL("Flag_Europe.png")); // Uses European flag as a placeholder
 	m_regions[DiscIO::IVolume::COUNTRY_ITALY].load(dir + SL("Flag_Italy.png"));
+	m_regions[DiscIO::IVolume::COUNTRY_KOREA].load(dir + SL("Flag_Korea.png"));
+	m_regions[DiscIO::IVolume::COUNTRY_NETHERLANDS].load(dir + SL("Flag_Netherlands.png"));
+	m_regions[DiscIO::IVolume::COUNTRY_RUSSIA].load(dir + SL("Flag_Russia.png"));
+	m_regions[DiscIO::IVolume::COUNTRY_SPAIN].load(dir + SL("Flag_Spain.png"));
 	m_regions[DiscIO::IVolume::COUNTRY_TAIWAN].load(dir + SL("Flag_Taiwan.png"));
-	m_regions[DiscIO::IVolume::COUNTRY_SDK].load(dir + SL("Flag_SDK.png"));
 	m_regions[DiscIO::IVolume::COUNTRY_UNKNOWN].load(dir + SL("Flag_Unknown.png"));
 
 	m_platforms.resize(3);