ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Country filter fixes/consistency

This commit is contained in:
Stevoisiak 2015-01-06 00:30:48 -05:00
parent a36fe1dd1d
commit e871add5f5
5 changed files with 75 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
Source/Core/DolphinQt/GameList/GameTracker.cpp
View File

@ -151,52 +151,57 @@ void DGameTracker::ScanForGames()
if (!SConfig::GetInstance().m_ListAustralia) if (!SConfig::GetInstance().m_ListAustralia)
list = false; list = false;
break; break;
case DiscIO::IVolume::COUNTRY_GERMANY: case DiscIO::IVolume::COUNTRY_EUROPE:
if (!SConfig::GetInstance().m_ListGermany) if (!SConfig::GetInstance().m_ListPal)
list = false;
break;
case DiscIO::IVolume::COUNTRY_RUSSIA:
if (!SConfig::GetInstance().m_ListRussia)
list = false;
break;
case DiscIO::IVolume::COUNTRY_UNKNOWN:
if (!SConfig::GetInstance().m_ListUnknown)
list = false;
break;
case DiscIO::IVolume::COUNTRY_TAIWAN:
if (!SConfig::GetInstance().m_ListTaiwan)
list = false;
break;
case DiscIO::IVolume::COUNTRY_KOREA:
if (!SConfig::GetInstance().m_ListKorea)
list = false;
break;
case DiscIO::IVolume::COUNTRY_JAPAN:
if (!SConfig::GetInstance().m_ListJap)
list = false;
break;
case DiscIO::IVolume::COUNTRY_USA:
if (!SConfig::GetInstance().m_ListUsa)
list = false; list = false;
break; break;
case DiscIO::IVolume::COUNTRY_FRANCE: case DiscIO::IVolume::COUNTRY_FRANCE:
if (!SConfig::GetInstance().m_ListFrance) if (!SConfig::GetInstance().m_ListFrance)
list = false; list = false;
break; break;
case DiscIO::IVolume::COUNTRY_GERMANY:
if (!SConfig::GetInstance().m_ListGermany)
list = false;
break;
case DiscIO::IVolume::COUNTRY_INTERNATIONAL:
if (!SConfig::GetInstance().m_ListInternational)
list = false;
break;
case DiscIO::IVolume::COUNTRY_ITALY: case DiscIO::IVolume::COUNTRY_ITALY:
if (!SConfig::GetInstance().m_ListItaly) if (!SConfig::GetInstance().m_ListItaly)
list = false; list = false;
break; break;
case DiscIO::IVolume::COUNTRY_SPAIN: case DiscIO::IVolume::COUNTRY_JAPAN:
if (!SConfig::GetInstance().m_ListSpain) if (!SConfig::GetInstance().m_ListJap)
list = false;
break;
case DiscIO::IVolume::COUNTRY_KOREA:
if (!SConfig::GetInstance().m_ListKorea)
list = false; list = false;
break; break;
case DiscIO::IVolume::COUNTRY_NETHERLANDS: case DiscIO::IVolume::COUNTRY_NETHERLANDS:
if (!SConfig::GetInstance().m_ListNetherlands) if (!SConfig::GetInstance().m_ListNetherlands)
list = false; list = false;
break; break;
case DiscIO::IVolume::COUNTRY_RUSSIA:
if (!SConfig::GetInstance().m_ListRussia)
list = false;
break;
case DiscIO::IVolume::COUNTRY_SPAIN:
if (!SConfig::GetInstance().m_ListSpain)
list = false;
break;
case DiscIO::IVolume::COUNTRY_TAIWAN:
if (!SConfig::GetInstance().m_ListTaiwan)
list = false;
break;
case DiscIO::IVolume::COUNTRY_USA:
if (!SConfig::GetInstance().m_ListUsa)
list = false;
break;
case DiscIO::IVolume::COUNTRY_UNKNOWN:
default: default:
if (!SConfig::GetInstance().m_ListPal) if (!SConfig::GetInstance().m_ListUnknown)
list = false; list = false;
break; break;
} }

2
Source/Core/DolphinWX/ConfigMain.cpp
View File

@ -1211,7 +1211,7 @@ inline u8 CConfigMain::GetSADRCountryCode(int language)
countrycode = 1; //Japan countrycode = 1; //Japan
break; break;
case 1: //English case 1: //English
countrycode = 49; // United States countrycode = 49; //United States
break; break;
case 2: //German case 2: //German
countrycode = 78; //Germany countrycode = 78; //Germany

3
Source/Core/DolphinWX/Frame.cpp
View File

@ -841,6 +841,7 @@ void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED (event))
SConfig::GetInstance().m_ListAustralia && SConfig::GetInstance().m_ListAustralia &&
SConfig::GetInstance().m_ListFrance && SConfig::GetInstance().m_ListFrance &&
SConfig::GetInstance().m_ListGermany && SConfig::GetInstance().m_ListGermany &&
SConfig::GetInstance().m_ListInternational &&
SConfig::GetInstance().m_ListItaly && SConfig::GetInstance().m_ListItaly &&
SConfig::GetInstance().m_ListKorea && SConfig::GetInstance().m_ListKorea &&
SConfig::GetInstance().m_ListNetherlands && SConfig::GetInstance().m_ListNetherlands &&
@ -858,6 +859,7 @@ void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED (event))
SConfig::GetInstance().m_ListAustralia = SConfig::GetInstance().m_ListAustralia =
SConfig::GetInstance().m_ListFrance = SConfig::GetInstance().m_ListFrance =
SConfig::GetInstance().m_ListGermany = SConfig::GetInstance().m_ListGermany =
SConfig::GetInstance().m_ListInternational =
SConfig::GetInstance().m_ListItaly = SConfig::GetInstance().m_ListItaly =
SConfig::GetInstance().m_ListKorea = SConfig::GetInstance().m_ListKorea =
SConfig::GetInstance().m_ListNetherlands = SConfig::GetInstance().m_ListNetherlands =
@ -875,6 +877,7 @@ void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED (event))
GetMenuBar()->FindItem(IDM_LIST_AUSTRALIA)->Check(true); GetMenuBar()->FindItem(IDM_LIST_AUSTRALIA)->Check(true);
GetMenuBar()->FindItem(IDM_LIST_FRANCE)->Check(true); GetMenuBar()->FindItem(IDM_LIST_FRANCE)->Check(true);
GetMenuBar()->FindItem(IDM_LIST_GERMANY)->Check(true); GetMenuBar()->FindItem(IDM_LIST_GERMANY)->Check(true);
GetMenuBar()->FindItem(IDM_LIST_INTERNATIONAL)->Check(true);
GetMenuBar()->FindItem(IDM_LIST_ITALY)->Check(true); GetMenuBar()->FindItem(IDM_LIST_ITALY)->Check(true);
GetMenuBar()->FindItem(IDM_LIST_KOREA)->Check(true); GetMenuBar()->FindItem(IDM_LIST_KOREA)->Check(true);
GetMenuBar()->FindItem(IDM_LIST_NETHERLANDS)->Check(true); GetMenuBar()->FindItem(IDM_LIST_NETHERLANDS)->Check(true);

3
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -1906,6 +1906,9 @@ void CFrame::GameListChanged(wxCommandEvent& event)
case IDM_LIST_GERMANY: case IDM_LIST_GERMANY:
SConfig::GetInstance().m_ListGermany = event.IsChecked(); SConfig::GetInstance().m_ListGermany = event.IsChecked();
break; break;
case IDM_LIST_INTERNATIONAL:
SConfig::GetInstance().m_ListInternational = event.IsChecked();
break;
case IDM_LIST_ITALY: case IDM_LIST_ITALY:
SConfig::GetInstance().m_ListItaly = event.IsChecked(); SConfig::GetInstance().m_ListItaly = event.IsChecked();
break; break;

63
Source/Core/DolphinWX/GameListCtrl.cpp
View File

@ -632,52 +632,57 @@ void CGameListCtrl::ScanForISOs()
if (!SConfig::GetInstance().m_ListAustralia) if (!SConfig::GetInstance().m_ListAustralia)
list = false; list = false;
break; break;
case DiscIO::IVolume::COUNTRY_GERMANY: case DiscIO::IVolume::COUNTRY_EUROPE:
if (!SConfig::GetInstance().m_ListGermany) if (!SConfig::GetInstance().m_ListPal)
list = false;
break;
case DiscIO::IVolume::COUNTRY_RUSSIA:
if (!SConfig::GetInstance().m_ListRussia)
list = false;
break;
case DiscIO::IVolume::COUNTRY_UNKNOWN:
if (!SConfig::GetInstance().m_ListUnknown)
list = false;
break;
case DiscIO::IVolume::COUNTRY_TAIWAN:
if (!SConfig::GetInstance().m_ListTaiwan)
list = false;
break;
case DiscIO::IVolume::COUNTRY_KOREA:
if (!SConfig::GetInstance().m_ListKorea)
list = false;
break;
case DiscIO::IVolume::COUNTRY_JAPAN:
if (!SConfig::GetInstance().m_ListJap)
list = false;
break;
case DiscIO::IVolume::COUNTRY_USA:
if (!SConfig::GetInstance().m_ListUsa)
list = false; list = false;
break; break;
case DiscIO::IVolume::COUNTRY_FRANCE: case DiscIO::IVolume::COUNTRY_FRANCE:
if (!SConfig::GetInstance().m_ListFrance) if (!SConfig::GetInstance().m_ListFrance)
list = false; list = false;
break; break;
case DiscIO::IVolume::COUNTRY_GERMANY:
if (!SConfig::GetInstance().m_ListGermany)
list = false;
break;
case DiscIO::IVolume::COUNTRY_INTERNATIONAL:
if (!SConfig::GetInstance().m_ListInternational)
list = false;
break;
case DiscIO::IVolume::COUNTRY_ITALY: case DiscIO::IVolume::COUNTRY_ITALY:
if (!SConfig::GetInstance().m_ListItaly) if (!SConfig::GetInstance().m_ListItaly)
list = false; list = false;
break; break;
case DiscIO::IVolume::COUNTRY_SPAIN: case DiscIO::IVolume::COUNTRY_JAPAN:
if (!SConfig::GetInstance().m_ListSpain) if (!SConfig::GetInstance().m_ListJap)
list = false;
break;
case DiscIO::IVolume::COUNTRY_KOREA:
if (!SConfig::GetInstance().m_ListKorea)
list = false; list = false;
break; break;
case DiscIO::IVolume::COUNTRY_NETHERLANDS: case DiscIO::IVolume::COUNTRY_NETHERLANDS:
if (!SConfig::GetInstance().m_ListNetherlands) if (!SConfig::GetInstance().m_ListNetherlands)
list = false; list = false;
break; break;
case DiscIO::IVolume::COUNTRY_RUSSIA:
if (!SConfig::GetInstance().m_ListRussia)
list = false;
break;
case DiscIO::IVolume::COUNTRY_SPAIN:
if (!SConfig::GetInstance().m_ListSpain)
list = false;
break;
case DiscIO::IVolume::COUNTRY_TAIWAN:
if (!SConfig::GetInstance().m_ListTaiwan)
list = false;
break;
case DiscIO::IVolume::COUNTRY_USA:
if (!SConfig::GetInstance().m_ListUsa)
list = false;
break;
case DiscIO::IVolume::COUNTRY_UNKNOWN:
default: default:
if (!SConfig::GetInstance().m_ListPal) if (!SConfig::GetInstance().m_ListUnknown)
list = false; list = false;
break; break;
} }