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

Merge pull request #1942 from Buddybenj/No-Intro 

Replace Country Names With No-Intro Names
This commit is contained in:
skidau 2015-02-23 12:56:28 +11:00
parent 81eb9bdf16 265a21a565
commit 793abccb5e
15 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/ConfigManager.cpp
View File

@ -288,7 +288,7 @@ void SConfig::SaveGameListSettings(IniFile& ini)
gamelist->Set("ListAustralia", m_ListAustralia); gamelist->Set("ListAustralia", m_ListAustralia);
gamelist->Set("ListFrance", m_ListFrance); gamelist->Set("ListFrance", m_ListFrance);
gamelist->Set("ListGermany", m_ListGermany); gamelist->Set("ListGermany", m_ListGermany);
gamelist->Set("ListInternational", m_ListInternational); gamelist->Set("ListWorld", m_ListWorld);
gamelist->Set("ListItaly", m_ListItaly); gamelist->Set("ListItaly", m_ListItaly);
gamelist->Set("ListKorea", m_ListKorea); gamelist->Set("ListKorea", m_ListKorea);
gamelist->Set("ListNetherlands", m_ListNetherlands); gamelist->Set("ListNetherlands", m_ListNetherlands);
@ -513,7 +513,7 @@ void SConfig::LoadGameListSettings(IniFile& ini)
gamelist->Get("ListAustralia", &m_ListAustralia, true); gamelist->Get("ListAustralia", &m_ListAustralia, true);
gamelist->Get("ListFrance", &m_ListFrance, true); gamelist->Get("ListFrance", &m_ListFrance, true);
gamelist->Get("ListGermany", &m_ListGermany, true); gamelist->Get("ListGermany", &m_ListGermany, true);
gamelist->Get("ListInternational", &m_ListInternational, true); gamelist->Get("ListWorld", &m_ListWorld, true);
gamelist->Get("ListItaly", &m_ListItaly, true); gamelist->Get("ListItaly", &m_ListItaly, true);
gamelist->Get("ListKorea", &m_ListKorea, true); gamelist->Get("ListKorea", &m_ListKorea, true);
gamelist->Get("ListNetherlands", &m_ListNetherlands, true); gamelist->Get("ListNetherlands", &m_ListNetherlands, true);

2
Source/Core/Core/ConfigManager.h
View File

@ -70,7 +70,7 @@ struct SConfig : NonCopyable
bool m_ListAustralia; bool m_ListAustralia;
bool m_ListFrance; bool m_ListFrance;
bool m_ListGermany; bool m_ListGermany;
bool m_ListInternational; bool m_ListWorld;
bool m_ListItaly; bool m_ListItaly;
bool m_ListKorea; bool m_ListKorea;
bool m_ListNetherlands; bool m_ListNetherlands;

2
Source/Core/Core/CoreParameter.cpp
View File

@ -123,7 +123,7 @@ static const char* GetRegionOfCountry(DiscIO::IVolume::ECountry country)
case DiscIO::IVolume::COUNTRY_EUROPE: case DiscIO::IVolume::COUNTRY_EUROPE:
case DiscIO::IVolume::COUNTRY_FRANCE: case DiscIO::IVolume::COUNTRY_FRANCE:
case DiscIO::IVolume::COUNTRY_GERMANY: case DiscIO::IVolume::COUNTRY_GERMANY:
case DiscIO::IVolume::COUNTRY_INTERNATIONAL: case DiscIO::IVolume::COUNTRY_WORLD:
case DiscIO::IVolume::COUNTRY_ITALY: case DiscIO::IVolume::COUNTRY_ITALY:
case DiscIO::IVolume::COUNTRY_NETHERLANDS: case DiscIO::IVolume::COUNTRY_NETHERLANDS:
case DiscIO::IVolume::COUNTRY_RUSSIA: case DiscIO::IVolume::COUNTRY_RUSSIA:

2
Source/Core/DiscIO/Volume.h
View File

@ -52,7 +52,7 @@ public:
COUNTRY_AUSTRALIA, COUNTRY_AUSTRALIA,
COUNTRY_FRANCE, COUNTRY_FRANCE,
COUNTRY_GERMANY, COUNTRY_GERMANY,
COUNTRY_INTERNATIONAL, COUNTRY_WORLD,
COUNTRY_ITALY, COUNTRY_ITALY,
COUNTRY_KOREA, COUNTRY_KOREA,
COUNTRY_NETHERLANDS, COUNTRY_NETHERLANDS,

2
Source/Core/DiscIO/VolumeCommon.cpp
View File

@ -18,7 +18,7 @@ IVolume::ECountry CountrySwitch(u8 CountryCode)
{ {
// Region free - Uses European flag as placeholder // Region free - Uses European flag as placeholder
case 'A': case 'A':
return IVolume::COUNTRY_INTERNATIONAL; return IVolume::COUNTRY_WORLD;
// PAL // PAL
case 'D': case 'D':

2
Source/Core/DolphinQt/GameList/GameFile.cpp
View File

@ -26,7 +26,7 @@
#include "DolphinQt/Utils/Resources.h" #include "DolphinQt/Utils/Resources.h"
#include "DolphinQt/Utils/Utils.h" #include "DolphinQt/Utils/Utils.h"
static const u32 CACHE_REVISION = 0x004; static const u32 CACHE_REVISION = 0x005;
static const u32 DATASTREAM_REVISION = 15; // Introduced in Qt 5.2 static const u32 DATASTREAM_REVISION = 15; // Introduced in Qt 5.2
static QStringList VectorToStringList(std::vector<std::string> vec, bool trim = false) static QStringList VectorToStringList(std::vector<std::string> vec, bool trim = false)

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

@ -163,8 +163,8 @@ void DGameTracker::ScanForGames()
if (!SConfig::GetInstance().m_ListGermany) if (!SConfig::GetInstance().m_ListGermany)
list = false; list = false;
break; break;
case DiscIO::IVolume::COUNTRY_INTERNATIONAL: case DiscIO::IVolume::COUNTRY_WORLD:
if (!SConfig::GetInstance().m_ListInternational) if (!SConfig::GetInstance().m_ListWorld)
list = false; list = false;
break; break;
case DiscIO::IVolume::COUNTRY_ITALY: case DiscIO::IVolume::COUNTRY_ITALY:

2
Source/Core/DolphinQt/Utils/Resources.cpp
View File

@ -31,7 +31,7 @@ void Resources::Init()
m_regions[DiscIO::IVolume::COUNTRY_AUSTRALIA].load(GIFN("Flag_Australia")); m_regions[DiscIO::IVolume::COUNTRY_AUSTRALIA].load(GIFN("Flag_Australia"));
m_regions[DiscIO::IVolume::COUNTRY_FRANCE].load(GIFN("Flag_France")); m_regions[DiscIO::IVolume::COUNTRY_FRANCE].load(GIFN("Flag_France"));
m_regions[DiscIO::IVolume::COUNTRY_GERMANY].load(GIFN("Flag_Germany")); m_regions[DiscIO::IVolume::COUNTRY_GERMANY].load(GIFN("Flag_Germany"));
m_regions[DiscIO::IVolume::COUNTRY_INTERNATIONAL].load(GIFN("Flag_Europe")); // Uses European flag as a placeholder m_regions[DiscIO::IVolume::COUNTRY_WORLD].load(GIFN("Flag_Europe")); // Uses European flag as a placeholder
m_regions[DiscIO::IVolume::COUNTRY_ITALY].load(GIFN("Flag_Italy")); m_regions[DiscIO::IVolume::COUNTRY_ITALY].load(GIFN("Flag_Italy"));
m_regions[DiscIO::IVolume::COUNTRY_KOREA].load(GIFN("Flag_Korea")); m_regions[DiscIO::IVolume::COUNTRY_KOREA].load(GIFN("Flag_Korea"));
m_regions[DiscIO::IVolume::COUNTRY_NETHERLANDS].load(GIFN("Flag_Netherlands")); m_regions[DiscIO::IVolume::COUNTRY_NETHERLANDS].load(GIFN("Flag_Netherlands"));

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

@ -1339,7 +1339,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; //USA
break; break;
case 2: //German case 2: //German
countrycode = 78; //Germany countrycode = 78; //Germany

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

@ -891,7 +891,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_ListWorld &&
SConfig::GetInstance().m_ListItaly && SConfig::GetInstance().m_ListItaly &&
SConfig::GetInstance().m_ListKorea && SConfig::GetInstance().m_ListKorea &&
SConfig::GetInstance().m_ListNetherlands && SConfig::GetInstance().m_ListNetherlands &&
@ -909,7 +909,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_ListWorld =
SConfig::GetInstance().m_ListItaly = SConfig::GetInstance().m_ListItaly =
SConfig::GetInstance().m_ListKorea = SConfig::GetInstance().m_ListKorea =
SConfig::GetInstance().m_ListNetherlands = SConfig::GetInstance().m_ListNetherlands =
@ -927,7 +927,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_WORLD)->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);

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

@ -335,8 +335,8 @@ wxMenuBar* CFrame::CreateMenu()
regionMenu->Check(IDM_LIST_FRANCE, SConfig::GetInstance().m_ListFrance); regionMenu->Check(IDM_LIST_FRANCE, SConfig::GetInstance().m_ListFrance);
regionMenu->AppendCheckItem(IDM_LIST_GERMANY, _("Show Germany")); regionMenu->AppendCheckItem(IDM_LIST_GERMANY, _("Show Germany"));
regionMenu->Check(IDM_LIST_GERMANY, SConfig::GetInstance().m_ListGermany); regionMenu->Check(IDM_LIST_GERMANY, SConfig::GetInstance().m_ListGermany);
regionMenu->AppendCheckItem(IDM_LIST_INTERNATIONAL, _("Show International")); regionMenu->AppendCheckItem(IDM_LIST_WORLD, _("Show World"));
regionMenu->Check(IDM_LIST_INTERNATIONAL, SConfig::GetInstance().m_ListInternational); regionMenu->Check(IDM_LIST_WORLD, SConfig::GetInstance().m_ListWorld);
regionMenu->AppendCheckItem(IDM_LIST_ITALY, _("Show Italy")); regionMenu->AppendCheckItem(IDM_LIST_ITALY, _("Show Italy"));
regionMenu->Check(IDM_LIST_ITALY, SConfig::GetInstance().m_ListItaly); regionMenu->Check(IDM_LIST_ITALY, SConfig::GetInstance().m_ListItaly);
regionMenu->AppendCheckItem(IDM_LIST_KOREA, _("Show Korea")); regionMenu->AppendCheckItem(IDM_LIST_KOREA, _("Show Korea"));
@ -1939,8 +1939,8 @@ 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: case IDM_LIST_WORLD:
SConfig::GetInstance().m_ListInternational = event.IsChecked(); SConfig::GetInstance().m_ListWorld = event.IsChecked();
break; break;
case IDM_LIST_ITALY: case IDM_LIST_ITALY:
SConfig::GetInstance().m_ListItaly = event.IsChecked(); SConfig::GetInstance().m_ListItaly = event.IsChecked();

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

@ -230,7 +230,7 @@ void CGameListCtrl::InitBitmaps()
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_AUSTRALIA] = m_imageListSmall->Add(wxBitmap(Flag_Australia_xpm)); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_AUSTRALIA] = m_imageListSmall->Add(wxBitmap(Flag_Australia_xpm));
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_FRANCE] = m_imageListSmall->Add(wxBitmap(Flag_France_xpm)); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_FRANCE] = m_imageListSmall->Add(wxBitmap(Flag_France_xpm));
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_GERMANY] = m_imageListSmall->Add(wxBitmap(Flag_Germany_xpm)); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_GERMANY] = m_imageListSmall->Add(wxBitmap(Flag_Germany_xpm));
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_INTERNATIONAL] = m_imageListSmall->Add(wxBitmap(Flag_Europe_xpm)); // Uses European flag as a placeholder m_FlagImageIndex[DiscIO::IVolume::COUNTRY_WORLD] = m_imageListSmall->Add(wxBitmap(Flag_Europe_xpm)); // Uses European flag as a placeholder
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_ITALY] = m_imageListSmall->Add(wxBitmap(Flag_Italy_xpm)); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_ITALY] = m_imageListSmall->Add(wxBitmap(Flag_Italy_xpm));
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_KOREA] = m_imageListSmall->Add(wxBitmap(Flag_Korea_xpm)); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_KOREA] = m_imageListSmall->Add(wxBitmap(Flag_Korea_xpm));
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_NETHERLANDS] = m_imageListSmall->Add(wxBitmap(Flag_Netherlands_xpm)); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_NETHERLANDS] = m_imageListSmall->Add(wxBitmap(Flag_Netherlands_xpm));
@ -630,8 +630,8 @@ void CGameListCtrl::ScanForISOs()
if (!SConfig::GetInstance().m_ListGermany) if (!SConfig::GetInstance().m_ListGermany)
list = false; list = false;
break; break;
case DiscIO::IVolume::COUNTRY_INTERNATIONAL: case DiscIO::IVolume::COUNTRY_WORLD:
if (!SConfig::GetInstance().m_ListInternational) if (!SConfig::GetInstance().m_ListWorld)
list = false; list = false;
break; break;
case DiscIO::IVolume::COUNTRY_ITALY: case DiscIO::IVolume::COUNTRY_ITALY:

2
Source/Core/DolphinWX/Globals.h
View File

@ -130,7 +130,7 @@ enum
IDM_LIST_AUSTRALIA, IDM_LIST_AUSTRALIA,
IDM_LIST_FRANCE, IDM_LIST_FRANCE,
IDM_LIST_GERMANY, IDM_LIST_GERMANY,
IDM_LIST_INTERNATIONAL, IDM_LIST_WORLD,
IDM_LIST_ITALY, IDM_LIST_ITALY,
IDM_LIST_KOREA, IDM_LIST_KOREA,
IDM_LIST_NETHERLANDS, IDM_LIST_NETHERLANDS,

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 = 0x120; static const u32 CACHE_REVISION = 0x121;
#define DVD_BANNER_WIDTH 96 #define DVD_BANNER_WIDTH 96
#define DVD_BANNER_HEIGHT 32 #define DVD_BANNER_HEIGHT 32

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

@ -204,8 +204,8 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
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_WORLD:
m_Country->SetValue(_("International")); m_Country->SetValue(_("World"));
break; break;
case DiscIO::IVolume::COUNTRY_ITALY: case DiscIO::IVolume::COUNTRY_ITALY:
m_Country->SetValue(_("Italy")); m_Country->SetValue(_("Italy"));
@ -223,7 +223,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
m_Country->SetValue(_("Spain")); m_Country->SetValue(_("Spain"));
break; break;
case DiscIO::IVolume::COUNTRY_USA: case DiscIO::IVolume::COUNTRY_USA:
m_Country->SetValue(_("United States")); m_Country->SetValue(_("USA"));
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);