Added support for PAL-R (Russia) ISO detection. Fixes issue 2575.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6251 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
aae0fa7909
commit
c6fa5804de
|
@ -171,6 +171,7 @@ bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2)
|
||||||
case DiscIO::IVolume::COUNTRY_EUROPE:
|
case DiscIO::IVolume::COUNTRY_EUROPE:
|
||||||
case DiscIO::IVolume::COUNTRY_FRANCE:
|
case DiscIO::IVolume::COUNTRY_FRANCE:
|
||||||
case DiscIO::IVolume::COUNTRY_ITALY:
|
case DiscIO::IVolume::COUNTRY_ITALY:
|
||||||
|
case DiscIO::IVolume::COUNTRY_RUSSIA:
|
||||||
bNTSC = false;
|
bNTSC = false;
|
||||||
Region = EUR_DIR;
|
Region = EUR_DIR;
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -44,8 +44,9 @@ public:
|
||||||
enum ECountry
|
enum ECountry
|
||||||
{
|
{
|
||||||
COUNTRY_EUROPE = 0,
|
COUNTRY_EUROPE = 0,
|
||||||
COUNTRY_FRANCE = 1,
|
COUNTRY_FRANCE,
|
||||||
COUNTRY_USA = 2,
|
COUNTRY_RUSSIA,
|
||||||
|
COUNTRY_USA,
|
||||||
COUNTRY_JAPAN,
|
COUNTRY_JAPAN,
|
||||||
COUNTRY_KOREA,
|
COUNTRY_KOREA,
|
||||||
COUNTRY_ITALY,
|
COUNTRY_ITALY,
|
||||||
|
|
|
@ -45,6 +45,10 @@ IVolume::ECountry CountrySwitch(u8 CountryCode)
|
||||||
return IVolume::COUNTRY_ITALY;
|
return IVolume::COUNTRY_ITALY;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 'R':
|
||||||
|
return IVolume::COUNTRY_RUSSIA;
|
||||||
|
break;
|
||||||
|
|
||||||
// NTSC
|
// NTSC
|
||||||
case 'E':
|
case 'E':
|
||||||
case 'N': // Japanese import to USA and other NTSC regions
|
case 'N': // Japanese import to USA and other NTSC regions
|
||||||
|
|
|
@ -146,6 +146,9 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
|
||||||
case DiscIO::IVolume::COUNTRY_ITALY:
|
case DiscIO::IVolume::COUNTRY_ITALY:
|
||||||
m_Country->SetValue(wxT("ITALY"));
|
m_Country->SetValue(wxT("ITALY"));
|
||||||
break;
|
break;
|
||||||
|
case DiscIO::IVolume::COUNTRY_RUSSIA:
|
||||||
|
m_Country->SetValue(wxT("RUSSIA"));
|
||||||
|
break;
|
||||||
case DiscIO::IVolume::COUNTRY_USA:
|
case DiscIO::IVolume::COUNTRY_USA:
|
||||||
m_Country->SetValue(wxT("USA"));
|
m_Country->SetValue(wxT("USA"));
|
||||||
m_Lang->SetSelection(0);
|
m_Lang->SetSelection(0);
|
||||||
|
|
Loading…
Reference in New Issue