piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 21:30:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

WX: Use TitleDatabase for getting title names

Browse Source
This commit is contained in:
Léo Lam
2017-05-15 16:26:22 +02:00
parent 89b5549fe0
commit 2f5f9be9ac
3 changed files with 16 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/DolphinWX/ISOFile.cpp
View File

@ -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<std::string, std::string>& 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();
}