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 #1234 from Stevoisiak/renameNamesToBannerNames 

Rename m_names to m_banner_names
This commit is contained in:
Lioncash 2014-10-07 20:01:29 -04:00
parent fab357552f ebbbe43b8f
commit ab49d80e3f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,7 +89,7 @@ GameListItem::GameListItem(const std::string& _rFileName)
if (pBannerLoader->IsValid())
{
if (m_Platform != WII_WAD)
m_names = pBannerLoader->GetNames();
m_banner_names = pBannerLoader->GetNames();
m_company = pBannerLoader->GetCompany();
m_descriptions = pBannerLoader->GetDescriptions();
@ -176,7 +176,7 @@ void GameListItem::DoState(PointerWrap &p)
{
p.Do(m_volume_names);
p.Do(m_company);
p.Do(m_names);
p.Do(m_banner_names);
p.Do(m_descriptions);
p.Do(m_UniqueID);
p.Do(m_FileSize);
@ -250,11 +250,11 @@ std::string GameListItem::GetBannerName(int _index) const
{
u32 const index = _index;
if (index < m_names.size() && !m_names[index].empty())
return m_names[index];
if (index < m_banner_names.size() && !m_banner_names[index].empty())
return m_banner_names[index];
if (!m_names.empty())
return m_names[0];
if (!m_banner_names.empty())
return m_banner_names[0];
return "";
}

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

@ -61,7 +61,7 @@ private:
// Stuff from banner
std::string m_company;
std::vector<std::string> m_names;
std::vector<std::string> m_banner_names;
std::vector<std::string> m_descriptions;
std::string m_UniqueID;