The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-05-01 21:52:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1870 from Stevoisiak/countryFilters

Browse Source 
Country filter fixes/consistency
This commit is contained in:
Ryan Houdek 2015-01-21 13:48:35 -06:00
commit e4b04c64f0
7 changed files with 91 additions and 75 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

@ -1264,7 +1264,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

@ -846,6 +846,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 &&
@ -863,6 +864,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 =
@ -880,6 +882,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;
} }

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

@ -37,7 +37,7 @@
#include "DolphinWX/ISOFile.h" #include "DolphinWX/ISOFile.h"
#include "DolphinWX/WxUtils.h" #include "DolphinWX/WxUtils.h"
static const u32 CACHE_REVISION = 0x118; static const u32 CACHE_REVISION = 0x119;
#define DVD_BANNER_WIDTH 96 #define DVD_BANNER_WIDTH 96
#define DVD_BANNER_HEIGHT 32 #define DVD_BANNER_HEIGHT 32

30
Source/Core/DolphinWX/ISOProperties.cpp
View File

@ -201,34 +201,34 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
switch (OpenISO->GetCountry()) switch (OpenISO->GetCountry())
{ {
case DiscIO::IVolume::COUNTRY_AUSTRALIA: case DiscIO::IVolume::COUNTRY_AUSTRALIA:
m_Country->SetValue(_("AUSTRALIA")); m_Country->SetValue(_("Australia"));
break; break;
case DiscIO::IVolume::COUNTRY_EUROPE: case DiscIO::IVolume::COUNTRY_EUROPE:
m_Country->SetValue(_("EUROPE")); m_Country->SetValue(_("Europe"));
break; break;
case DiscIO::IVolume::COUNTRY_FRANCE: case DiscIO::IVolume::COUNTRY_FRANCE:
m_Country->SetValue(_("FRANCE")); m_Country->SetValue(_("France"));
break; break;
case DiscIO::IVolume::COUNTRY_INTERNATIONAL: case DiscIO::IVolume::COUNTRY_INTERNATIONAL:
m_Country->SetValue(_("INTERNATIONAL")); m_Country->SetValue(_("International"));
break; break;
case DiscIO::IVolume::COUNTRY_ITALY: case DiscIO::IVolume::COUNTRY_ITALY:
m_Country->SetValue(_("ITALY")); m_Country->SetValue(_("Italy"));
break; break;
case DiscIO::IVolume::COUNTRY_GERMANY: case DiscIO::IVolume::COUNTRY_GERMANY:
m_Country->SetValue(_("GERMANY")); m_Country->SetValue(_("Germany"));
break; break;
case DiscIO::IVolume::COUNTRY_NETHERLANDS: case DiscIO::IVolume::COUNTRY_NETHERLANDS:
m_Country->SetValue(_("NETHERLANDS")); m_Country->SetValue(_("Netherlands"));
break; break;
case DiscIO::IVolume::COUNTRY_RUSSIA: case DiscIO::IVolume::COUNTRY_RUSSIA:
m_Country->SetValue(_("RUSSIA")); m_Country->SetValue(_("Russia"));
break; break;
case DiscIO::IVolume::COUNTRY_SPAIN: case DiscIO::IVolume::COUNTRY_SPAIN:
m_Country->SetValue(_("SPAIN")); m_Country->SetValue(_("Spain"));
break; break;
case DiscIO::IVolume::COUNTRY_USA: case DiscIO::IVolume::COUNTRY_USA:
m_Country->SetValue(_("USA")); m_Country->SetValue(_("United States"));
if (!IsWad) // For (non wad) NTSC Games, there's no multi lang if (!IsWad) // For (non wad) NTSC Games, there's no multi lang
{ {
m_Lang->SetSelection(0); m_Lang->SetSelection(0);
@ -237,7 +237,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
break; break;
case DiscIO::IVolume::COUNTRY_JAPAN: case DiscIO::IVolume::COUNTRY_JAPAN:
m_Country->SetValue(_("JAPAN")); m_Country->SetValue(_("Japan"));
if (!IsWad) // For (non wad) NTSC Games, there's no multi lang if (!IsWad) // For (non wad) NTSC Games, there's no multi lang
{ {
m_Lang->Insert(_("Japanese"), 0); m_Lang->Insert(_("Japanese"), 0);
@ -246,20 +246,20 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
} }
break; break;
case DiscIO::IVolume::COUNTRY_KOREA: case DiscIO::IVolume::COUNTRY_KOREA:
m_Country->SetValue(_("KOREA")); m_Country->SetValue(_("Korea"));
break; break;
case DiscIO::IVolume::COUNTRY_TAIWAN: case DiscIO::IVolume::COUNTRY_TAIWAN:
m_Country->SetValue(_("TAIWAN")); m_Country->SetValue(_("Taiwan"));
if (!IsWad) // For (non wad) NTSC Games, there's no multi lang if (!IsWad) // For (non wad) NTSC Games, there's no multi lang
{ {
m_Lang->Insert(_("TAIWAN"), 0); m_Lang->Insert(_("Taiwan"), 0);
m_Lang->SetSelection(0); m_Lang->SetSelection(0);
m_Lang->Disable(); m_Lang->Disable();
} }
break; break;
case DiscIO::IVolume::COUNTRY_UNKNOWN: case DiscIO::IVolume::COUNTRY_UNKNOWN:
default: default:
m_Country->SetValue(_("UNKNOWN")); m_Country->SetValue(_("Unknown"));
break; break;
} }