Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename m_names to m_banner_names #1234

Merged
merged 1 commit into from Oct 8, 2014
Merged

Rename m_names to m_banner_names #1234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions Source/Core/DolphinWX/ISOFile.cpp
View file
Open in desktop
Expand Up @@ -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();

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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 "";
}
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/DolphinWX/ISOFile.h
View file
Open in desktop
Expand Up @@ -61,7 +61,7 @@ class GameListItem : NonCopyable

// 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;
Expand Down