Add Taiwan to the Country Codes, move all country code switches to one function, add unk country flag and taiwan country flag
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3666 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
15e4eed7fa
commit
4c86d218c1
|
@ -83,7 +83,7 @@ void CBoot::EmulatedBIOS(bool _bDebug)
|
|||
|
||||
// Load Apploader to Memory - The apploader is hardcoded to begin at byte 9 280 on the disc,
|
||||
// but it seems like the size can be variable. Compare with yagcd chap 13.
|
||||
//
|
||||
|
||||
PowerPC::ppcState.gpr[1] = 0x816ffff0; // StackPointer
|
||||
u32 iAppLoaderOffset = 0x2440; // 0x1c40 - 2MB lower...perhaps used on early GCMs? MYSTERY OLD COMMENT
|
||||
u32 iAppLoaderEntry = VolumeHandler::Read32(iAppLoaderOffset + 0x10);
|
||||
|
@ -169,7 +169,10 @@ bool CBoot::SetupWiiMemory(unsigned int _CountryCode)
|
|||
std::string filename(File::GetSysDirectory() + WII_SYS_DIR + DIR_SEP + WII_EUR_SETTING);
|
||||
switch((DiscIO::IVolume::ECountry)_CountryCode)
|
||||
{
|
||||
case DiscIO::IVolume::COUNTRY_JAP:
|
||||
case DiscIO::IVolume::COUNTRY_KOREA:
|
||||
case DiscIO::IVolume::COUNTRY_TAIWAN:
|
||||
// TODO: Determine if Korea / Taiwan have their own specific settings.
|
||||
case DiscIO::IVolume::COUNTRY_JAPAN:
|
||||
filename = File::GetSysDirectory() + WII_SYS_DIR + DIR_SEP + WII_JAP_SETTING;
|
||||
break;
|
||||
|
||||
|
|
|
@ -109,7 +109,10 @@ bool SCoreStartupParameter::AutoSetup(EBootBios _BootBios)
|
|||
Region = USA_DIR;
|
||||
break;
|
||||
|
||||
case DiscIO::IVolume::COUNTRY_JAP:
|
||||
case DiscIO::IVolume::COUNTRY_TAIWAN:
|
||||
case DiscIO::IVolume::COUNTRY_KOREA:
|
||||
// TODO: Should these have their own Region Dir?
|
||||
case DiscIO::IVolume::COUNTRY_JAPAN:
|
||||
bNTSC = true;
|
||||
Region = JAP_DIR;
|
||||
break;
|
||||
|
|
|
@ -536,6 +536,58 @@
|
|||
RelativePath=".\Src\Volume.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\Src\VolumeCommon.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ForcedIncludeFiles="stdafx.h"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Debug|x64"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ForcedIncludeFiles="stdafx.h"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ForcedIncludeFiles="stdafx.h"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|x64"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ForcedIncludeFiles="stdafx.h"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="DebugFast|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ForcedIncludeFiles="stdafx.h"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="DebugFast|x64"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ForcedIncludeFiles="stdafx.h"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\Src\VolumeCreator.cpp"
|
||||
>
|
||||
|
|
|
@ -332,67 +332,18 @@ bool CNANDContentLoader::ParseTMD(u8* pDataApp, u32 pDataAppSize, u8* pTicket, u
|
|||
|
||||
const DiscIO::IVolume::ECountry CNANDContentLoader::GetCountry() const
|
||||
{
|
||||
DiscIO::IVolume::ECountry country = DiscIO::IVolume::COUNTRY_UNKNOWN;
|
||||
if (!IsValid())
|
||||
return DiscIO::IVolume::COUNTRY_UNKNOWN;
|
||||
|
||||
if (IsValid())
|
||||
{
|
||||
u64 TitleID = GetTitleID();
|
||||
char* pTitleID = (char*)&TitleID;
|
||||
|
||||
switch (pTitleID[0])
|
||||
{
|
||||
case 'S':
|
||||
country = DiscIO::IVolume::COUNTRY_EUROPE;
|
||||
break; // PAL // <- that is shitty :) zelda demo disc
|
||||
return CountrySwitch((u8)pTitleID[0]);
|
||||
|
||||
case 'P':
|
||||
country = DiscIO::IVolume::COUNTRY_EUROPE;
|
||||
break; // PAL
|
||||
|
||||
case 'D':
|
||||
country = DiscIO::IVolume::COUNTRY_EUROPE;
|
||||
break; // PAL
|
||||
|
||||
case 'F':
|
||||
country = DiscIO::IVolume::COUNTRY_FRANCE;
|
||||
break; // PAL
|
||||
|
||||
case 'I':
|
||||
country = DiscIO::IVolume::COUNTRY_ITALY;
|
||||
break; // PAL
|
||||
|
||||
case 'X':
|
||||
country = DiscIO::IVolume::COUNTRY_EUROPE;
|
||||
break; // XIII <- uses X but is PAL rip
|
||||
|
||||
case 'E':
|
||||
country = DiscIO::IVolume::COUNTRY_USA;
|
||||
break; // USA
|
||||
|
||||
case 'J':
|
||||
country = DiscIO::IVolume::COUNTRY_JAP;
|
||||
break; // JAP
|
||||
|
||||
case 'K':
|
||||
country = DiscIO::IVolume::COUNTRY_KOR;
|
||||
break; // KOR
|
||||
|
||||
case 'O':
|
||||
country = DiscIO::IVolume::COUNTRY_UNKNOWN;
|
||||
break; // SDK
|
||||
|
||||
default:
|
||||
PanicAlert("Unknown Country Code!");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return(country);
|
||||
}
|
||||
|
||||
|
||||
///////////////////
|
||||
|
||||
|
||||
CNANDContentManager CNANDContentManager::m_Instance;
|
||||
|
||||
|
@ -424,12 +375,5 @@ const INANDContentLoader& CNANDContentManager::GetNANDLoader(const std::string&
|
|||
return *m_Map[KeyString];
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
} // namespace end
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -14,6 +14,7 @@ files = [
|
|||
'FileHandlerARC.cpp',
|
||||
'Filesystem.cpp',
|
||||
'FileSystemGCWii.cpp',
|
||||
'VolumeCommon.cpp',
|
||||
'VolumeCreator.cpp',
|
||||
'VolumeDirectory.cpp',
|
||||
'VolumeGC.cpp',
|
||||
|
|
|
@ -52,9 +52,11 @@ class IVolume
|
|||
COUNTRY_EUROPE = 0,
|
||||
COUNTRY_FRANCE = 1,
|
||||
COUNTRY_USA = 2,
|
||||
COUNTRY_JAP,
|
||||
COUNTRY_KOR,
|
||||
COUNTRY_JAPAN,
|
||||
COUNTRY_KOREA,
|
||||
COUNTRY_ITALY,
|
||||
COUNTRY_TAIWAN,
|
||||
COUNTRY_SDK,
|
||||
COUNTRY_UNKNOWN,
|
||||
NUMBER_OF_COUNTRIES
|
||||
};
|
||||
|
@ -62,6 +64,10 @@ class IVolume
|
|||
virtual ECountry GetCountry() const = 0;
|
||||
virtual u64 GetSize() const = 0;
|
||||
};
|
||||
|
||||
// Generic Switch function for all volumes
|
||||
IVolume::ECountry CountrySwitch(u8 CountryCode);
|
||||
|
||||
} // namespace
|
||||
|
||||
#endif
|
||||
|
|
|
@ -163,52 +163,7 @@ IVolume::ECountry CVolumeDirectory::GetCountry() const
|
|||
|
||||
u8 CountryCode = m_diskHeader[3];
|
||||
|
||||
ECountry country = COUNTRY_UNKNOWN;
|
||||
|
||||
switch (CountryCode)
|
||||
{
|
||||
case 'S':
|
||||
country = COUNTRY_EUROPE;
|
||||
break; // PAL <- that is shitty :) zelda demo disc
|
||||
|
||||
case 'P':
|
||||
country = COUNTRY_EUROPE;
|
||||
break; // PAL
|
||||
|
||||
case 'D':
|
||||
country = COUNTRY_EUROPE;
|
||||
break; // PAL
|
||||
|
||||
case 'F':
|
||||
country = COUNTRY_FRANCE;
|
||||
break; // PAL
|
||||
|
||||
case 'I':
|
||||
country = COUNTRY_ITALY;
|
||||
break; // PAL
|
||||
|
||||
case 'X':
|
||||
country = COUNTRY_EUROPE;
|
||||
break; // XIII <- uses X but is PAL rip
|
||||
|
||||
case 'E':
|
||||
country = COUNTRY_USA;
|
||||
break; // USA
|
||||
|
||||
case 'J':
|
||||
country = COUNTRY_JAP;
|
||||
break; // JAP
|
||||
|
||||
case 'O':
|
||||
country = COUNTRY_UNKNOWN;
|
||||
break; // SDK
|
||||
|
||||
default:
|
||||
country = COUNTRY_UNKNOWN;
|
||||
break;
|
||||
}
|
||||
|
||||
return(country);
|
||||
return CountrySwitch(CountryCode);
|
||||
}
|
||||
|
||||
std::string CVolumeDirectory::GetMakerID() const
|
||||
|
@ -250,18 +205,12 @@ u64 CVolumeDirectory::GetSize() const
|
|||
return 0;
|
||||
}
|
||||
|
||||
static const char DIR_SEPARATOR =
|
||||
#ifdef _WIN32
|
||||
'\\';
|
||||
#else
|
||||
'/';
|
||||
#endif
|
||||
|
||||
std::string CVolumeDirectory::ExtractDirectoryName(const std::string& _rDirectory)
|
||||
{
|
||||
std::string directoryName = _rDirectory;
|
||||
|
||||
size_t lastSep = directoryName.find_last_of(DIR_SEPARATOR);
|
||||
size_t lastSep = directoryName.find_last_of(DIR_SEP_CHR);
|
||||
|
||||
if(lastSep != directoryName.size() - 1)
|
||||
{
|
||||
|
|
|
@ -70,53 +70,7 @@ IVolume::ECountry CVolumeGC::GetCountry() const
|
|||
u8 CountryCode;
|
||||
m_pReader->Read(3, 1, &CountryCode);
|
||||
|
||||
ECountry country = COUNTRY_UNKNOWN;
|
||||
|
||||
switch (CountryCode)
|
||||
{
|
||||
case 'S':
|
||||
country = COUNTRY_EUROPE;
|
||||
break; // PAL // <- that is shitty :) zelda demo disc
|
||||
|
||||
case 'P':
|
||||
country = COUNTRY_EUROPE;
|
||||
break; // PAL
|
||||
|
||||
case 'D':
|
||||
country = COUNTRY_EUROPE;
|
||||
break; // PAL
|
||||
|
||||
case 'F':
|
||||
country = COUNTRY_FRANCE;
|
||||
break; // PAL
|
||||
|
||||
case 'I':
|
||||
country = COUNTRY_ITALY;
|
||||
break; // PAL
|
||||
|
||||
case 'X':
|
||||
country = COUNTRY_EUROPE;
|
||||
break; // XIII <- uses X but is PAL
|
||||
|
||||
case 'E':
|
||||
country = COUNTRY_USA;
|
||||
break; // USA
|
||||
|
||||
case 'J':
|
||||
country = COUNTRY_JAP;
|
||||
break; // JAP
|
||||
|
||||
case 'O':
|
||||
country = COUNTRY_UNKNOWN;
|
||||
break; // SDK
|
||||
|
||||
default:
|
||||
// PanicAlert(StringFromFormat("Unknown Country Code!").c_str());
|
||||
country = COUNTRY_UNKNOWN;
|
||||
break;
|
||||
}
|
||||
|
||||
return(country);
|
||||
return CountrySwitch(CountryCode);
|
||||
}
|
||||
|
||||
std::string CVolumeGC::GetMakerID() const
|
||||
|
|
|
@ -57,58 +57,12 @@ IVolume::ECountry CVolumeWAD::GetCountry() const
|
|||
return COUNTRY_UNKNOWN;
|
||||
|
||||
u8 CountryCode;
|
||||
|
||||
u32 Offset = ALIGN_40(hdr_size) + ALIGN_40(cert_size);
|
||||
|
||||
// read the last digit of the titleID in the ticket
|
||||
Read(Offset + 0x01E3, 1, &CountryCode);
|
||||
|
||||
ECountry country = COUNTRY_UNKNOWN;
|
||||
|
||||
switch (CountryCode)
|
||||
{
|
||||
case 'S':
|
||||
country = COUNTRY_EUROPE;
|
||||
break; // PAL // <- that is shitty :) zelda demo disc
|
||||
|
||||
case 'P':
|
||||
country = COUNTRY_EUROPE;
|
||||
break; // PAL
|
||||
|
||||
case 'D':
|
||||
country = COUNTRY_EUROPE;
|
||||
break; // PAL
|
||||
|
||||
case 'F':
|
||||
country = COUNTRY_FRANCE;
|
||||
break; // PAL
|
||||
|
||||
case 'I':
|
||||
country = COUNTRY_ITALY;
|
||||
break; // PAL
|
||||
|
||||
case 'X':
|
||||
country = COUNTRY_EUROPE;
|
||||
break; // XIII <- uses X but is PAL
|
||||
|
||||
case 'E':
|
||||
country = COUNTRY_USA;
|
||||
break; // USA
|
||||
|
||||
case 'J':
|
||||
country = COUNTRY_JAP;
|
||||
break; // JAP
|
||||
|
||||
case 'O':
|
||||
country = COUNTRY_UNKNOWN;
|
||||
break; // SDK
|
||||
|
||||
default:
|
||||
country = COUNTRY_UNKNOWN;
|
||||
break;
|
||||
}
|
||||
|
||||
return(country);
|
||||
return CountrySwitch(CountryCode);
|
||||
}
|
||||
|
||||
std::string CVolumeWAD::GetUniqueID() const
|
||||
|
|
|
@ -121,63 +121,12 @@ std::string CVolumeWiiCrypted::GetUniqueID() const
|
|||
IVolume::ECountry CVolumeWiiCrypted::GetCountry() const
|
||||
{
|
||||
if (!m_pReader)
|
||||
{
|
||||
return(COUNTRY_UNKNOWN);
|
||||
}
|
||||
return COUNTRY_UNKNOWN;
|
||||
|
||||
u8 CountryCode;
|
||||
m_pReader->Read(3, 1, &CountryCode);
|
||||
|
||||
ECountry country = COUNTRY_UNKNOWN;
|
||||
|
||||
switch (CountryCode)
|
||||
{
|
||||
case 'S':
|
||||
country = COUNTRY_EUROPE;
|
||||
break; // PAL // <- that is shitty :) zelda demo disc
|
||||
|
||||
case 'P':
|
||||
country = COUNTRY_EUROPE;
|
||||
break; // PAL
|
||||
|
||||
case 'D':
|
||||
country = COUNTRY_EUROPE;
|
||||
break; // PAL
|
||||
|
||||
case 'F':
|
||||
country = COUNTRY_FRANCE;
|
||||
break; // PAL
|
||||
|
||||
case 'I':
|
||||
country = COUNTRY_ITALY;
|
||||
break; // PAL
|
||||
|
||||
case 'X':
|
||||
country = COUNTRY_EUROPE;
|
||||
break; // XIII <- uses X but is PAL rip
|
||||
|
||||
case 'E':
|
||||
country = COUNTRY_USA;
|
||||
break; // USA
|
||||
|
||||
case 'J':
|
||||
country = COUNTRY_JAP;
|
||||
break; // JAP
|
||||
|
||||
case 'K':
|
||||
country = COUNTRY_KOR;
|
||||
break; // KOR
|
||||
|
||||
case 'O':
|
||||
country = COUNTRY_UNKNOWN;
|
||||
break; // SDK
|
||||
|
||||
default:
|
||||
PanicAlert("Unknown Country Code!");
|
||||
break;
|
||||
}
|
||||
|
||||
return(country);
|
||||
return CountrySwitch(CountryCode);
|
||||
}
|
||||
|
||||
std::string CVolumeWiiCrypted::GetMakerID() const
|
||||
|
|
|
@ -948,6 +948,14 @@
|
|||
RelativePath=".\resources\Flag_Japan.xpm"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\resources\Flag_Taiwan.xpm"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\resources\Flag_Unknown.xpm"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\resources\Flag_USA.xpm"
|
||||
>
|
||||
|
|
|
@ -39,8 +39,11 @@
|
|||
#include "../resources/Flag_France.xpm"
|
||||
#include "../resources/Flag_Italy.xpm"
|
||||
#include "../resources/Flag_Japan.xpm"
|
||||
#include "../resources/Platform_Wad.xpm"
|
||||
#include "../resources/Flag_USA.xpm"
|
||||
#include "../resources/Flag_Taiwan.xpm"
|
||||
#include "../resources/Flag_Unknown.xpm"
|
||||
|
||||
#include "../resources/Platform_Wad.xpm"
|
||||
#include "../resources/Platform_Wii.xpm"
|
||||
#include "../resources/Platform_Gamecube.xpm"
|
||||
#endif // USE_XPM_BITMAPS
|
||||
|
@ -58,14 +61,14 @@ bool operator < (const GameListItem &one, const GameListItem &other)
|
|||
|
||||
switch (one.GetCountry())
|
||||
{
|
||||
case DiscIO::IVolume::COUNTRY_JAP:;
|
||||
case DiscIO::IVolume::COUNTRY_JAPAN:;
|
||||
case DiscIO::IVolume::COUNTRY_USA:indexOne = 0; break;
|
||||
default: indexOne = (int)SConfig::GetInstance().m_InterfaceLanguage;
|
||||
}
|
||||
|
||||
switch (other.GetCountry())
|
||||
{
|
||||
case DiscIO::IVolume::COUNTRY_JAP:;
|
||||
case DiscIO::IVolume::COUNTRY_JAPAN:;
|
||||
case DiscIO::IVolume::COUNTRY_USA:indexOther = 0; break;
|
||||
default: indexOther = (int)SConfig::GetInstance().m_InterfaceLanguage;
|
||||
}
|
||||
|
@ -116,17 +119,25 @@ void CGameListCtrl::InitBitmaps()
|
|||
SetImageList(m_imageListSmall, wxIMAGE_LIST_SMALL);
|
||||
m_FlagImageIndex.resize(DiscIO::IVolume::NUMBER_OF_COUNTRIES);
|
||||
wxIcon iconTemp;
|
||||
|
||||
iconTemp.CopyFromBitmap(wxBitmap(Flag_Europe_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_EUROPE] = m_imageListSmall->Add(iconTemp);
|
||||
iconTemp.CopyFromBitmap(wxBitmap(Flag_France_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_FRANCE] = m_imageListSmall->Add(iconTemp);
|
||||
iconTemp.CopyFromBitmap(wxBitmap(Flag_Italy_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_ITALY] = m_imageListSmall->Add(iconTemp);
|
||||
iconTemp.CopyFromBitmap(wxBitmap(Flag_USA_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_USA] = m_imageListSmall->Add(iconTemp);
|
||||
iconTemp.CopyFromBitmap(wxBitmap(Flag_Japan_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_JAP] = m_imageListSmall->Add(iconTemp);
|
||||
iconTemp.CopyFromBitmap(wxBitmap(Flag_Europe_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_JAPAN] = m_imageListSmall->Add(iconTemp);
|
||||
iconTemp.CopyFromBitmap(wxBitmap(Flag_Unknown_xpm)); // TODO add korea flag
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_KOREA] = m_imageListSmall->Add(iconTemp);
|
||||
iconTemp.CopyFromBitmap(wxBitmap(Flag_Italy_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_ITALY] = m_imageListSmall->Add(iconTemp);
|
||||
iconTemp.CopyFromBitmap(wxBitmap(Flag_Taiwan_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_TAIWAN] = m_imageListSmall->Add(iconTemp);
|
||||
|
||||
iconTemp.CopyFromBitmap(wxBitmap(Flag_Unknown_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_SDK] = m_imageListSmall->Add(iconTemp);
|
||||
iconTemp.CopyFromBitmap(wxBitmap(Flag_Unknown_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_UNKNOWN] = m_imageListSmall->Add(iconTemp);
|
||||
|
||||
m_PlatformImageIndex.resize(3);
|
||||
|
@ -308,7 +319,7 @@ void CGameListCtrl::InsertItemInReportView(long _Index)
|
|||
|
||||
switch (rISOFile.GetCountry())
|
||||
{
|
||||
case DiscIO::IVolume::COUNTRY_JAP:
|
||||
case DiscIO::IVolume::COUNTRY_JAPAN:
|
||||
// keep these codes, when we move to wx unicode...
|
||||
//wxCSConv convFrom(wxFontMapper::GetEncodingName(wxFONTENCODING_SHIFT_JIS));
|
||||
//wxCSConv convTo(wxFontMapper::GetEncodingName(wxFONTENCODING_DEFAULT));
|
||||
|
@ -526,7 +537,11 @@ void CGameListCtrl::ScanForISOs()
|
|||
|
||||
switch(ISOFile.GetCountry())
|
||||
{
|
||||
case DiscIO::IVolume::COUNTRY_JAP:
|
||||
case DiscIO::IVolume::COUNTRY_TAIWAN:
|
||||
case DiscIO::IVolume::COUNTRY_KOREA:
|
||||
// TODO: Add these to interface choices, or combine with japan?
|
||||
break;
|
||||
case DiscIO::IVolume::COUNTRY_JAPAN:
|
||||
if (!SConfig::GetInstance().m_ListJap)
|
||||
list = false;
|
||||
break;
|
||||
|
@ -593,14 +608,14 @@ int wxCALLBACK wxListCompare(long item1, long item2, long sortData)
|
|||
|
||||
switch (iso1->GetCountry())
|
||||
{
|
||||
case DiscIO::IVolume::COUNTRY_JAP:;
|
||||
case DiscIO::IVolume::COUNTRY_JAPAN:;
|
||||
case DiscIO::IVolume::COUNTRY_USA:indexOne = 0; break;
|
||||
default: indexOne = (int)SConfig::GetInstance().m_InterfaceLanguage;
|
||||
}
|
||||
|
||||
switch (iso2->GetCountry())
|
||||
{
|
||||
case DiscIO::IVolume::COUNTRY_JAP:;
|
||||
case DiscIO::IVolume::COUNTRY_JAPAN:;
|
||||
case DiscIO::IVolume::COUNTRY_USA:indexOther = 0; break;
|
||||
default: indexOther = (int)SConfig::GetInstance().m_InterfaceLanguage;
|
||||
}
|
||||
|
|
|
@ -121,15 +121,28 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
|
|||
switch (OpenISO->GetCountry())
|
||||
{
|
||||
case DiscIO::IVolume::COUNTRY_EUROPE:
|
||||
m_Country->SetValue(wxString::FromAscii("EUROPE"));
|
||||
break;
|
||||
case DiscIO::IVolume::COUNTRY_FRANCE:
|
||||
m_Country->SetValue(wxString::FromAscii("FRANCE"));
|
||||
break;
|
||||
case DiscIO::IVolume::COUNTRY_ITALY:
|
||||
m_Country->SetValue(wxString::FromAscii("EUR"));
|
||||
m_Country->SetValue(wxString::FromAscii("ITALY"));
|
||||
break;
|
||||
case DiscIO::IVolume::COUNTRY_USA:
|
||||
m_Country->SetValue(wxString::FromAscii("USA"));
|
||||
break;
|
||||
case DiscIO::IVolume::COUNTRY_JAP:
|
||||
m_Country->SetValue(wxString::FromAscii("JAP"));
|
||||
case DiscIO::IVolume::COUNTRY_JAPAN:
|
||||
m_Country->SetValue(wxString::FromAscii("JAPAN"));
|
||||
break;
|
||||
case DiscIO::IVolume::COUNTRY_KOREA:
|
||||
m_Country->SetValue(wxString::FromAscii("KOREA"));
|
||||
break;
|
||||
case DiscIO::IVolume::COUNTRY_TAIWAN:
|
||||
m_Country->SetValue(wxString::FromAscii("TAIWAN"));
|
||||
break;
|
||||
case DiscIO::IVolume::COUNTRY_SDK:
|
||||
m_Country->SetValue(wxString::FromAscii("No Country (SDK)"));
|
||||
break;
|
||||
default:
|
||||
m_Country->SetValue(wxString::FromAscii("UNKNOWN"));
|
||||
|
|
|
@ -0,0 +1,124 @@
|
|||
/* XPM */
|
||||
static const char * Flag_Taiwan_xpm[] = {
|
||||
"96 32 89 1",
|
||||
" c None",
|
||||
". c #000000",
|
||||
"# c #000099",
|
||||
"$ c #000098",
|
||||
"% c #03039A",
|
||||
"& c #000094",
|
||||
"' c #05059B",
|
||||
"( c #050095",
|
||||
") c #DC0014",
|
||||
"* c #FF0000",
|
||||
"+ c #FD0001",
|
||||
", c #04049B",
|
||||
"- c #000096",
|
||||
"! c #020299",
|
||||
"0 c #2424A7",
|
||||
"1 c #04049A",
|
||||
"2 c #000097",
|
||||
"3 c #000093",
|
||||
"4 c #6262BF",
|
||||
"5 c #2828A8",
|
||||
"6 c #6C6CC1",
|
||||
"7 c #3E3EB1",
|
||||
"8 c #3B3BB0",
|
||||
"9 c #00008F",
|
||||
": c #01019A",
|
||||
"; c #1919A3",
|
||||
"< c #4040B0",
|
||||
"= c #6363C0",
|
||||
"> c #D6D6EE",
|
||||
"? c #D9D9ED",
|
||||
"@ c #C5C5E7",
|
||||
"A c #3F3FB0",
|
||||
"B c #3D3DAF",
|
||||
"C c #020297",
|
||||
"D c #010199",
|
||||
"E c #5E5EBE",
|
||||
"F c #DFDFF2",
|
||||
"G c white",
|
||||
"H c #BFBFE5",
|
||||
"I c #2626A7",
|
||||
"J c #4242B0",
|
||||
"K c #7D7DCA",
|
||||
"L c #FAFAFD",
|
||||
"M c #FBFBFD",
|
||||
"N c #FCFCFD",
|
||||
"O c #FCFCFE",
|
||||
"P c #DADAF0",
|
||||
"Q c #6A6AC2",
|
||||
"R c #1B1BA3",
|
||||
"S c #000199",
|
||||
"T c #0E0E9B",
|
||||
"U c #5858BC",
|
||||
"V c #D3D3ED",
|
||||
"W c #2727A6",
|
||||
"X c #060699",
|
||||
"Y c #1212A0",
|
||||
"Z c #6464C0",
|
||||
"[ c #8080CC",
|
||||
"] c #F4F4FA",
|
||||
"^ c #F8F8FB",
|
||||
"_ c #7070C4",
|
||||
"` c #4949B5",
|
||||
"a c #000095",
|
||||
"b c #040499",
|
||||
"c c #000092",
|
||||
"d c #6767C2",
|
||||
"e c #8686CA",
|
||||
"f c #7070C5",
|
||||
"g c #2B2BA9",
|
||||
"h c #00009A",
|
||||
"i c #01049C",
|
||||
"j c #1619A4",
|
||||
"k c #393CB3",
|
||||
"l c #00029A",
|
||||
"m c #1619A5",
|
||||
"n c #020096",
|
||||
"o c #DB0014",
|
||||
"p c #FC0001",
|
||||
"q c #0A0092",
|
||||
"r c #060090",
|
||||
"s c #0B0092",
|
||||
"t c #0F008E",
|
||||
"u c #DD0013",
|
||||
"v c #FD0000",
|
||||
"w c #E5000F",
|
||||
"x c #E6010F",
|
||||
"y c #E60110",
|
||||
"z c #FB0002",
|
||||
"{ c #FE0000",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
"................................ ",
|
||||
".#####$%#&'$$$##()*+***********. ",
|
||||
".###$$,-!0&1!$##()*+***********. ",
|
||||
".##$#23456789:$#()*+***********. ",
|
||||
".###2;<=>?@ABCD#()*+***********. ",
|
||||
".###$CEFGGGHI&D$()*+***********. ",
|
||||
".##D-JKLMNOPQR-S()*+***********. ",
|
||||
".###$TUGGNGVWX$#()*+***********. ",
|
||||
".###2YZ[]^P_`aD$()*+***********. ",
|
||||
".###$bcdEefg3D$#()*+***********. ",
|
||||
".hhhhhijiklm#hhhno*p***********. ",
|
||||
".qqqqqqrsrqrqqqqtu*v***********. ",
|
||||
".wwwwwwxwywxwwwwwz*{***********. ",
|
||||
".******************************. ",
|
||||
".{{{{{{{{{{{{{{{{{*{***********. ",
|
||||
".******************************. ",
|
||||
".******************************. ",
|
||||
".******************************. ",
|
||||
".******************************. ",
|
||||
"................................ ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" "};
|
|
@ -0,0 +1,50 @@
|
|||
/* XPM */
|
||||
static const char *const Flag_Unknown_xpm[] = {
|
||||
"96 32 15 1",
|
||||
" c None",
|
||||
"! c black",
|
||||
"# c #360000",
|
||||
"$ c #D60000",
|
||||
"% c #1B0000",
|
||||
"& c #6B0000",
|
||||
"' c #510000",
|
||||
"( c #280000",
|
||||
") c #BB0000",
|
||||
"* c #780000",
|
||||
"+ c #A00000",
|
||||
", c #0D0000",
|
||||
"- c #C90000",
|
||||
". c #AE0000",
|
||||
"0 c #430000",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ",
|
||||
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ",
|
||||
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ",
|
||||
"!!!!!!!!!!!!!!!!!!!!!!!####!!!!! ",
|
||||
"!!!!!!!!!!!!!!!!!!!!!!!#$$#!###! ",
|
||||
"!!!%&'!!!!%&'!()$$$$$*!#$$##$$#! ",
|
||||
"!!!#$+!!!!#$+,-$$$$$$$&#$$#))$#! ",
|
||||
"!!!#$+!!!!#$+#$.!!!!0$+#$$)))#!! ",
|
||||
"!!!#$+!!!!#$+#$+!!!!#$+#$$))#!!! ",
|
||||
"!!!#$+!!!!#$+#$+!!!!#$+#$$))#!!! ",
|
||||
"!!!#$+!!!!#$+#$+!!!!#$+#$$)))#!! ",
|
||||
"!!!#$.!!!!0$+#$+!!!!#$+#))#))$#! ",
|
||||
"!!!,-$$$$$$$&#$+!!!!#$+#$$!#$$#! ",
|
||||
"!!!!()$$$$$*!%&'!!!!%&'!##!!##!! ",
|
||||
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ",
|
||||
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ",
|
||||
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ",
|
||||
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ",
|
||||
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ",
|
||||
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" "};
|
Loading…
Reference in New Issue