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

Adds Italy country code 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2600 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
LPFaint99 2009-03-07 18:03:53 +00:00
parent c3cda83bb2
commit 7455361ed2
7 changed files with 110 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Core/Core/Src/CoreParameter.cpp
View File

@ -109,6 +109,7 @@ bool SCoreStartupParameter::AutoSetup(EBootBios _BootBios)
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:
bNTSC = false; bNTSC = false;
Region = EUR_DIR; Region = EUR_DIR;
break; break;
@ -134,13 +135,13 @@ bool SCoreStartupParameter::AutoSetup(EBootBios _BootBios)
m_BootType = BOOT_DOL; m_BootType = BOOT_DOL;
bNTSC = true; bNTSC = true;
} }
else if (DiscIO::CNANDContentLoader(m_strFilename).IsValid()) else if (DiscIO::CNANDContentLoader(m_strFilename).IsValid())
{ {
bWii = true; bWii = true;
Region = EUR_DIR; Region = EUR_DIR;
m_BootType = BOOT_WII_NAND; m_BootType = BOOT_WII_NAND;
bNTSC = false; bNTSC = false;
} }
else else
{ {
PanicAlert("Could not recognize ISO file %s", m_strFilename.c_str()); PanicAlert("Could not recognize ISO file %s", m_strFilename.c_str());

1
Source/Core/DiscIO/Src/Volume.h
View File

@ -53,6 +53,7 @@ class IVolume
COUNTRY_USA = 2, COUNTRY_USA = 2,
COUNTRY_JAP, COUNTRY_JAP,
COUNTRY_KOR, COUNTRY_KOR,
COUNTRY_ITALY,
COUNTRY_UNKNOWN, COUNTRY_UNKNOWN,
NUMBER_OF_COUNTRIES NUMBER_OF_COUNTRIES
}; };

62
Source/Core/DiscIO/Src/VolumeDirectory.cpp
View File

@ -167,41 +167,45 @@ IVolume::ECountry CVolumeDirectory::GetCountry() const
switch (CountryCode) switch (CountryCode)
{ {
case 'S': case 'S':
country = COUNTRY_EUROPE; country = COUNTRY_EUROPE;
break; // PAL <- that is shitty :) zelda demo disc break; // PAL <- that is shitty :) zelda demo disc
case 'P': case 'P':
country = COUNTRY_EUROPE; country = COUNTRY_EUROPE;
break; // PAL break; // PAL
case 'D': case 'D':
country = COUNTRY_EUROPE; country = COUNTRY_EUROPE;
break; // PAL break; // PAL
case 'F': case 'F':
country = COUNTRY_FRANCE; country = COUNTRY_FRANCE;
break; // PAL break; // PAL
case 'I':
country = COUNTRY_ITALY;
break; // PAL
case 'X': case 'X':
country = COUNTRY_EUROPE; country = COUNTRY_EUROPE;
break; // XIII <- uses X but is PAL rip break; // XIII <- uses X but is PAL rip
case 'E': case 'E':
country = COUNTRY_USA; country = COUNTRY_USA;
break; // USA break; // USA
case 'J': case 'J':
country = COUNTRY_JAP; country = COUNTRY_JAP;
break; // JAP break; // JAP
case 'O': case 'O':
country = COUNTRY_UNKNOWN; country = COUNTRY_UNKNOWN;
break; // SDK break; // SDK
default: default:
country = COUNTRY_UNKNOWN; country = COUNTRY_UNKNOWN;
break; break;
} }
return(country); return(country);
@ -262,8 +266,8 @@ std::string CVolumeDirectory::ExtractDirectoryName(const std::string& _rDirector
if(lastSep != directoryName.size() - 1) if(lastSep != directoryName.size() - 1)
{ {
// TODO: This assumes that file names will always have a dot in them // TODO: This assumes that file names will always have a dot in them
// and directory names never will; both assumptions are often // and directory names never will; both assumptions are often
// right but in general wrong. // right but in general wrong.
size_t extensionStart = directoryName.find_last_of('.'); size_t extensionStart = directoryName.find_last_of('.');
if(extensionStart != std::string::npos && extensionStart > lastSep) if(extensionStart != std::string::npos && extensionStart > lastSep)
{ {

60
Source/Core/DiscIO/Src/VolumeGC.cpp
View File

@ -88,42 +88,46 @@ IVolume::ECountry CVolumeGC::GetCountry() const
switch (CountryCode) switch (CountryCode)
{ {
case 'S': case 'S':
country = COUNTRY_EUROPE; country = COUNTRY_EUROPE;
break; // PAL // <- that is shitty :) zelda demo disc break; // PAL // <- that is shitty :) zelda demo disc
case 'P': case 'P':
country = COUNTRY_EUROPE; country = COUNTRY_EUROPE;
break; // PAL break; // PAL
case 'D': case 'D':
country = COUNTRY_EUROPE; country = COUNTRY_EUROPE;
break; // PAL break; // PAL
case 'F': case 'F':
country = COUNTRY_FRANCE; country = COUNTRY_FRANCE;
break; // PAL break; // PAL
case 'X': case 'I':
country = COUNTRY_EUROPE; country = COUNTRY_ITALY;
break; // XIII <- uses X but is PAL break; // PAL
case 'E': case 'X':
country = COUNTRY_USA; country = COUNTRY_EUROPE;
break; // USA break; // XIII <- uses X but is PAL
case 'J': case 'E':
country = COUNTRY_JAP; country = COUNTRY_USA;
break; // JAP break; // USA
case 'O': case 'J':
country = COUNTRY_UNKNOWN; country = COUNTRY_JAP;
break; // SDK break; // JAP
default: case 'O':
// PanicAlert(StringFromFormat("Unknown Country Code!").c_str()); country = COUNTRY_UNKNOWN;
country = COUNTRY_UNKNOWN; break; // SDK
break;
default:
// PanicAlert(StringFromFormat("Unknown Country Code!").c_str());
country = COUNTRY_UNKNOWN;
break;
} }
return(country); return(country);

64
Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp
View File

@ -90,7 +90,7 @@ CVolumeWiiCrypted::Read(u64 _ReadOffset, u64 _Length, u8* _pBuffer) const
// increase buffers // increase buffers
_Length -= CopySize; _Length -= CopySize;
_pBuffer += CopySize; _pBuffer += CopySize;
_ReadOffset += CopySize; _ReadOffset += CopySize;
} }
@ -133,45 +133,49 @@ CVolumeWiiCrypted::GetCountry() const
switch (CountryCode) switch (CountryCode)
{ {
case 'S': case 'S':
country = COUNTRY_EUROPE; country = COUNTRY_EUROPE;
break; // PAL // <- that is shitty :) zelda demo disc break; // PAL // <- that is shitty :) zelda demo disc
case 'P': case 'P':
country = COUNTRY_EUROPE; country = COUNTRY_EUROPE;
break; // PAL break; // PAL
case 'D': case 'D':
country = COUNTRY_EUROPE; country = COUNTRY_EUROPE;
break; // PAL break; // PAL
case 'F': case 'F':
country = COUNTRY_FRANCE; country = COUNTRY_FRANCE;
break; // PAL break; // PAL
case 'X': case 'I':
country = COUNTRY_EUROPE; country = COUNTRY_ITALY;
break; // XIII <- uses X but is PAL rip break; // PAL
case 'E': case 'X':
country = COUNTRY_USA; country = COUNTRY_EUROPE;
break; // USA break; // XIII <- uses X but is PAL rip
case 'J': case 'E':
country = COUNTRY_JAP; country = COUNTRY_USA;
break; // JAP break; // USA
case 'J':
country = COUNTRY_JAP;
break; // JAP
case 'K': case 'K':
country = COUNTRY_KOR; country = COUNTRY_KOR;
break; // KOR break; // KOR
case 'O': case 'O':
country = COUNTRY_UNKNOWN; country = COUNTRY_UNKNOWN;
break; // SDK break; // SDK
default: default:
PanicAlert(StringFromFormat("Unknown Country Code!").c_str()); PanicAlert(StringFromFormat("Unknown Country Code!").c_str());
break; break;
} }
return(country); return(country);

1
Source/Core/DolphinWX/Src/GameListCtrl.cpp
View File

@ -110,6 +110,7 @@ void CGameListCtrl::InitBitmaps()
wxIcon iconTemp; wxIcon iconTemp;
iconTemp.CopyFromBitmap(wxBitmap(Flag_Europe_xpm)); iconTemp.CopyFromBitmap(wxBitmap(Flag_Europe_xpm));
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_EUROPE] = m_imageListSmall->Add(iconTemp); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_EUROPE] = m_imageListSmall->Add(iconTemp);
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_ITALY] = m_imageListSmall->Add(iconTemp);
iconTemp.CopyFromBitmap(wxBitmap(Flag_France_xpm)); iconTemp.CopyFromBitmap(wxBitmap(Flag_France_xpm));
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_FRANCE] = m_imageListSmall->Add(iconTemp); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_FRANCE] = m_imageListSmall->Add(iconTemp);
iconTemp.CopyFromBitmap(wxBitmap(Flag_USA_xpm)); iconTemp.CopyFromBitmap(wxBitmap(Flag_USA_xpm));

1
Source/Core/DolphinWX/Src/ISOProperties.cpp
View File

@ -92,6 +92,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
{ {
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:
m_Country->SetValue(wxString::FromAscii("EUR")); m_Country->SetValue(wxString::FromAscii("EUR"));
break; break;
case DiscIO::IVolume::COUNTRY_USA: case DiscIO::IVolume::COUNTRY_USA: