From 2f5f9be9aca9459c71abcfd9b00b385913834423 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Mon, 15 May 2017 16:26:22 +0200 Subject: WX: Use TitleDatabase for getting title names --- Source/Core/DolphinWX/ISOFile.cpp | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'Source/Core/DolphinWX/ISOFile.cpp') diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp index 0169d67d98..276a5da882 100644 --- a/Source/Core/DolphinWX/ISOFile.cpp +++ b/Source/Core/DolphinWX/ISOFile.cpp @@ -29,6 +29,7 @@ #include "Core/Boot/Boot.h" #include "Core/ConfigManager.h" #include "Core/IOS/ES/Formats.h" +#include "Core/TitleDatabase.h" #include "DiscIO/Blob.h" #include "DiscIO/Enums.h" @@ -62,8 +63,7 @@ static std::string GetLanguageString(DiscIO::Language language, return ""; } -GameListItem::GameListItem(const std::string& _rFileName, - const std::unordered_map& custom_titles) +GameListItem::GameListItem(const std::string& _rFileName, const Core::TitleDatabase& title_database) : m_FileName(_rFileName), m_title_id(0), m_emu_state(0), m_FileSize(0), m_region(DiscIO::Region::UNKNOWN_REGION), m_Country(DiscIO::Country::COUNTRY_UNKNOWN), m_Revision(0), m_Valid(false), m_ImageWidth(0), m_ImageHeight(0), m_disc_number(0), @@ -125,18 +125,10 @@ GameListItem::GameListItem(const std::string& _rFileName, if (IsValid()) { - std::string short_game_id = m_game_id; - - // Ignore publisher ID for WAD files - if (m_Platform == DiscIO::Platform::WII_WAD && short_game_id.size() > 4) - short_game_id.erase(4); - - auto it = custom_titles.find(short_game_id); - if (it != custom_titles.end()) - { - m_custom_name_titles_txt = it->second; - } - + const auto type = m_Platform == DiscIO::Platform::WII_WAD ? + Core::TitleDatabase::TitleType::Channel : + Core::TitleDatabase::TitleType::Other; + m_custom_name_titles_txt = title_database.GetTitleName(m_game_id, type); ReloadINI(); } -- cgit v1.2.3