From 265a21a565d1caa1b38bd17b92120fe38edc839c Mon Sep 17 00:00:00 2001 From: Buddybenj Date: Tue, 17 Feb 2015 18:17:34 -0600 Subject: [PATCH] Replace Country Names With No-Intro Names --- Source/Core/Core/ConfigManager.cpp | 4 ++-- Source/Core/Core/ConfigManager.h | 2 +- Source/Core/Core/CoreParameter.cpp | 2 +- Source/Core/DiscIO/Volume.h | 2 +- Source/Core/DiscIO/VolumeCommon.cpp | 2 +- Source/Core/DolphinQt/GameList/GameFile.cpp | 2 +- Source/Core/DolphinQt/GameList/GameTracker.cpp | 4 ++-- Source/Core/DolphinQt/Utils/Resources.cpp | 2 +- Source/Core/DolphinWX/ConfigMain.cpp | 2 +- Source/Core/DolphinWX/Frame.cpp | 6 +++--- Source/Core/DolphinWX/FrameTools.cpp | 8 ++++---- Source/Core/DolphinWX/GameListCtrl.cpp | 6 +++--- Source/Core/DolphinWX/Globals.h | 2 +- Source/Core/DolphinWX/ISOFile.cpp | 2 +- Source/Core/DolphinWX/ISOProperties.cpp | 6 +++--- 15 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index f52e160404..b75ad8230f 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -287,7 +287,7 @@ void SConfig::SaveGameListSettings(IniFile& ini) gamelist->Set("ListAustralia", m_ListAustralia); gamelist->Set("ListFrance", m_ListFrance); gamelist->Set("ListGermany", m_ListGermany); - gamelist->Set("ListInternational", m_ListInternational); + gamelist->Set("ListWorld", m_ListWorld); gamelist->Set("ListItaly", m_ListItaly); gamelist->Set("ListKorea", m_ListKorea); gamelist->Set("ListNetherlands", m_ListNetherlands); @@ -512,7 +512,7 @@ void SConfig::LoadGameListSettings(IniFile& ini) gamelist->Get("ListAustralia", &m_ListAustralia, true); gamelist->Get("ListFrance", &m_ListFrance, 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("ListKorea", &m_ListKorea, true); gamelist->Get("ListNetherlands", &m_ListNetherlands, true); diff --git a/Source/Core/Core/ConfigManager.h b/Source/Core/Core/ConfigManager.h index 249a85f59f..de53c35b8c 100644 --- a/Source/Core/Core/ConfigManager.h +++ b/Source/Core/Core/ConfigManager.h @@ -70,7 +70,7 @@ struct SConfig : NonCopyable bool m_ListAustralia; bool m_ListFrance; bool m_ListGermany; - bool m_ListInternational; + bool m_ListWorld; bool m_ListItaly; bool m_ListKorea; bool m_ListNetherlands; diff --git a/Source/Core/Core/CoreParameter.cpp b/Source/Core/Core/CoreParameter.cpp index a93cdd0205..810cc3fc25 100644 --- a/Source/Core/Core/CoreParameter.cpp +++ b/Source/Core/Core/CoreParameter.cpp @@ -122,7 +122,7 @@ static const char* GetRegionOfCountry(DiscIO::IVolume::ECountry country) case DiscIO::IVolume::COUNTRY_EUROPE: case DiscIO::IVolume::COUNTRY_FRANCE: case DiscIO::IVolume::COUNTRY_GERMANY: - case DiscIO::IVolume::COUNTRY_INTERNATIONAL: + case DiscIO::IVolume::COUNTRY_WORLD: case DiscIO::IVolume::COUNTRY_ITALY: case DiscIO::IVolume::COUNTRY_NETHERLANDS: case DiscIO::IVolume::COUNTRY_RUSSIA: diff --git a/Source/Core/DiscIO/Volume.h b/Source/Core/DiscIO/Volume.h index 3cb115bf7a..812e0ee3f4 100644 --- a/Source/Core/DiscIO/Volume.h +++ b/Source/Core/DiscIO/Volume.h @@ -53,7 +53,7 @@ public: COUNTRY_AUSTRALIA, COUNTRY_FRANCE, COUNTRY_GERMANY, - COUNTRY_INTERNATIONAL, + COUNTRY_WORLD, COUNTRY_ITALY, COUNTRY_KOREA, COUNTRY_NETHERLANDS, diff --git a/Source/Core/DiscIO/VolumeCommon.cpp b/Source/Core/DiscIO/VolumeCommon.cpp index c7ab76777b..ee2df9c078 100644 --- a/Source/Core/DiscIO/VolumeCommon.cpp +++ b/Source/Core/DiscIO/VolumeCommon.cpp @@ -18,7 +18,7 @@ IVolume::ECountry CountrySwitch(u8 CountryCode) { // Region free - Uses European flag as placeholder case 'A': - return IVolume::COUNTRY_INTERNATIONAL; + return IVolume::COUNTRY_WORLD; // PAL case 'D': diff --git a/Source/Core/DolphinQt/GameList/GameFile.cpp b/Source/Core/DolphinQt/GameList/GameFile.cpp index 141ce73304..80a773f8d9 100644 --- a/Source/Core/DolphinQt/GameList/GameFile.cpp +++ b/Source/Core/DolphinQt/GameList/GameFile.cpp @@ -26,7 +26,7 @@ #include "DolphinQt/Utils/Resources.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 QStringList VectorToStringList(std::vector vec, bool trim = false) diff --git a/Source/Core/DolphinQt/GameList/GameTracker.cpp b/Source/Core/DolphinQt/GameList/GameTracker.cpp index 23ebc8a14f..6f3b880898 100644 --- a/Source/Core/DolphinQt/GameList/GameTracker.cpp +++ b/Source/Core/DolphinQt/GameList/GameTracker.cpp @@ -163,8 +163,8 @@ void DGameTracker::ScanForGames() if (!SConfig::GetInstance().m_ListGermany) list = false; break; - case DiscIO::IVolume::COUNTRY_INTERNATIONAL: - if (!SConfig::GetInstance().m_ListInternational) + case DiscIO::IVolume::COUNTRY_WORLD: + if (!SConfig::GetInstance().m_ListWorld) list = false; break; case DiscIO::IVolume::COUNTRY_ITALY: diff --git a/Source/Core/DolphinQt/Utils/Resources.cpp b/Source/Core/DolphinQt/Utils/Resources.cpp index 04875f9f1e..cb26274eed 100644 --- a/Source/Core/DolphinQt/Utils/Resources.cpp +++ b/Source/Core/DolphinQt/Utils/Resources.cpp @@ -31,7 +31,7 @@ void Resources::Init() 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_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_KOREA].load(GIFN("Flag_Korea")); m_regions[DiscIO::IVolume::COUNTRY_NETHERLANDS].load(GIFN("Flag_Netherlands")); diff --git a/Source/Core/DolphinWX/ConfigMain.cpp b/Source/Core/DolphinWX/ConfigMain.cpp index 8ad31e0675..a15b97d805 100644 --- a/Source/Core/DolphinWX/ConfigMain.cpp +++ b/Source/Core/DolphinWX/ConfigMain.cpp @@ -1327,7 +1327,7 @@ inline u8 CConfigMain::GetSADRCountryCode(int language) countrycode = 1; //Japan break; case 1: //English - countrycode = 49; //United States + countrycode = 49; //USA break; case 2: //German countrycode = 78; //Germany diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 2446cb4cd3..49e146b764 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -891,7 +891,7 @@ void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED (event)) SConfig::GetInstance().m_ListAustralia && SConfig::GetInstance().m_ListFrance && SConfig::GetInstance().m_ListGermany && - SConfig::GetInstance().m_ListInternational && + SConfig::GetInstance().m_ListWorld && SConfig::GetInstance().m_ListItaly && SConfig::GetInstance().m_ListKorea && SConfig::GetInstance().m_ListNetherlands && @@ -909,7 +909,7 @@ void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED (event)) SConfig::GetInstance().m_ListAustralia = SConfig::GetInstance().m_ListFrance = SConfig::GetInstance().m_ListGermany = - SConfig::GetInstance().m_ListInternational = + SConfig::GetInstance().m_ListWorld = SConfig::GetInstance().m_ListItaly = SConfig::GetInstance().m_ListKorea = 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_FRANCE)->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_KOREA)->Check(true); GetMenuBar()->FindItem(IDM_LIST_NETHERLANDS)->Check(true); diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index e9848176bf..a54de8d651 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -335,8 +335,8 @@ wxMenuBar* CFrame::CreateMenu() regionMenu->Check(IDM_LIST_FRANCE, SConfig::GetInstance().m_ListFrance); regionMenu->AppendCheckItem(IDM_LIST_GERMANY, _("Show Germany")); regionMenu->Check(IDM_LIST_GERMANY, SConfig::GetInstance().m_ListGermany); - regionMenu->AppendCheckItem(IDM_LIST_INTERNATIONAL, _("Show International")); - regionMenu->Check(IDM_LIST_INTERNATIONAL, SConfig::GetInstance().m_ListInternational); + regionMenu->AppendCheckItem(IDM_LIST_WORLD, _("Show World")); + regionMenu->Check(IDM_LIST_WORLD, SConfig::GetInstance().m_ListWorld); regionMenu->AppendCheckItem(IDM_LIST_ITALY, _("Show Italy")); regionMenu->Check(IDM_LIST_ITALY, SConfig::GetInstance().m_ListItaly); regionMenu->AppendCheckItem(IDM_LIST_KOREA, _("Show Korea")); @@ -1939,8 +1939,8 @@ void CFrame::GameListChanged(wxCommandEvent& event) case IDM_LIST_GERMANY: SConfig::GetInstance().m_ListGermany = event.IsChecked(); break; - case IDM_LIST_INTERNATIONAL: - SConfig::GetInstance().m_ListInternational = event.IsChecked(); + case IDM_LIST_WORLD: + SConfig::GetInstance().m_ListWorld = event.IsChecked(); break; case IDM_LIST_ITALY: SConfig::GetInstance().m_ListItaly = event.IsChecked(); diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp index a055aa270d..b1e7766852 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -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_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_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_KOREA] = m_imageListSmall->Add(wxBitmap(Flag_Korea_xpm)); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_NETHERLANDS] = m_imageListSmall->Add(wxBitmap(Flag_Netherlands_xpm)); @@ -644,8 +644,8 @@ void CGameListCtrl::ScanForISOs() if (!SConfig::GetInstance().m_ListGermany) list = false; break; - case DiscIO::IVolume::COUNTRY_INTERNATIONAL: - if (!SConfig::GetInstance().m_ListInternational) + case DiscIO::IVolume::COUNTRY_WORLD: + if (!SConfig::GetInstance().m_ListWorld) list = false; break; case DiscIO::IVolume::COUNTRY_ITALY: diff --git a/Source/Core/DolphinWX/Globals.h b/Source/Core/DolphinWX/Globals.h index 2ca8a01f6d..9a2187f2ff 100644 --- a/Source/Core/DolphinWX/Globals.h +++ b/Source/Core/DolphinWX/Globals.h @@ -130,7 +130,7 @@ enum IDM_LIST_AUSTRALIA, IDM_LIST_FRANCE, IDM_LIST_GERMANY, - IDM_LIST_INTERNATIONAL, + IDM_LIST_WORLD, IDM_LIST_ITALY, IDM_LIST_KOREA, IDM_LIST_NETHERLANDS, diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp index dd46734cd4..5851e3bfd9 100644 --- a/Source/Core/DolphinWX/ISOFile.cpp +++ b/Source/Core/DolphinWX/ISOFile.cpp @@ -37,7 +37,7 @@ #include "DolphinWX/ISOFile.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_HEIGHT 32 diff --git a/Source/Core/DolphinWX/ISOProperties.cpp b/Source/Core/DolphinWX/ISOProperties.cpp index 45b790aa36..ee8e377d21 100644 --- a/Source/Core/DolphinWX/ISOProperties.cpp +++ b/Source/Core/DolphinWX/ISOProperties.cpp @@ -209,8 +209,8 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW case DiscIO::IVolume::COUNTRY_FRANCE: m_Country->SetValue(_("France")); break; - case DiscIO::IVolume::COUNTRY_INTERNATIONAL: - m_Country->SetValue(_("International")); + case DiscIO::IVolume::COUNTRY_WORLD: + m_Country->SetValue(_("World")); break; case DiscIO::IVolume::COUNTRY_ITALY: m_Country->SetValue(_("Italy")); @@ -228,7 +228,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW m_Country->SetValue(_("Spain")); break; 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 { m_Lang->SetSelection(0);