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

Kill wstring version of game description.

Browse Source
This commit is contained in:
Jordan Woyak
2013-03-01 19:33:17 -06:00
parent b0630790c1
commit e079d24912
8 changed files with 120 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Core/DolphinWX/Src/GameListCtrl.cpp
View File

@ -456,16 +456,9 @@ void CGameListCtrl::InsertItemInReportView(long _Index)
SetItemColumnImage(_Index, COLUMN_BANNER, ImageIndex);
std::wstring wstring_name;
const std::wstring& wstring_description = rISOFile.GetDescription();
std::string company;
wxString name;
wxString description;
// We show the company string on Gamecube only
// On Wii we show the description instead as the company string is empty
if (rISOFile.GetPlatform() == GameListItem::GAMECUBE_DISC)
company = rISOFile.GetCompany().c_str();
int SelectedLanguage = SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage;
switch (rISOFile.GetCountry())
{
@ -475,11 +468,10 @@ void CGameListCtrl::InsertItemInReportView(long _Index)
rISOFile.GetName(wstring_name, -1);
name = wxString(rISOFile.GetName(0).c_str(), SJISConv);
m_gameList.append(StringFromFormat("%s (J)\n", (const char *)name.c_str()));
description = wxString(company.size() ? company.c_str() :
rISOFile.GetDescription(0).c_str(), SJISConv);
}
break;
case DiscIO::IVolume::COUNTRY_USA:
// Is this sane?
SelectedLanguage = 0;
default:
{
@ -490,19 +482,21 @@ void CGameListCtrl::InsertItemInReportView(long _Index)
m_gameList.append(StringFromFormat("%s (%c)\n",
rISOFile.GetName(SelectedLanguage).c_str(),
(rISOFile.GetCountry() == DiscIO::IVolume::COUNTRY_USA) ? 'U' : 'E'));
description = wxString(company.size() ? company.c_str() :
rISOFile.GetDescription(SelectedLanguage).c_str(), WindowsCP1252);
}
break;
}
if (wstring_name.length())
name = wstring_name.c_str();
if (wstring_description.length())
description = wstring_description.c_str();
SetItem(_Index, COLUMN_TITLE, name, -1);
SetItem(_Index, COLUMN_NOTES, description, -1);
// We show the company string on Gamecube only
// On Wii we show the description instead as the company string is empty
std::string const notes = (rISOFile.GetPlatform() == GameListItem::GAMECUBE_DISC) ?
rISOFile.GetCompany() : rISOFile.GetDescription(SelectedLanguage);
SetItem(_Index, COLUMN_NOTES, StrToWxStr(notes), -1);
// Emulation state
SetItemColumnImage(_Index, COLUMN_EMULATION_STATE, m_EmuStateImageIndex[rISOFile.GetEmuState()]);

9
Source/Core/DolphinWX/Src/ISOFile.cpp
View File

@ -37,7 +37,7 @@
#include "ChunkFile.h"
#include "ConfigManager.h"
#define CACHE_REVISION 0x10F
#define CACHE_REVISION 0x110
#define DVD_BANNER_WIDTH 96
#define DVD_BANNER_HEIGHT 32
@ -109,7 +109,6 @@ GameListItem::GameListItem(const std::string& _rFileName)
pBannerLoader->GetName(m_wNames);
pBannerLoader->GetName(m_Name);
pBannerLoader->GetCompany(m_Company);
pBannerLoader->GetDescription(m_wDescription);
pBannerLoader->GetDescription(m_Description);
if (pBannerLoader->GetBanner(g_ImageTemp))
@ -235,7 +234,6 @@ void GameListItem::DoState(PointerWrap &p)
p.Do(m_Company);
p.Do(m_Description[0]); p.Do(m_Description[1]); p.Do(m_Description[2]);
p.Do(m_Description[3]); p.Do(m_Description[4]); p.Do(m_Description[5]);
p.Do(m_wDescription);
p.Do(m_UniqueID);
p.Do(m_FileSize);
p.Do(m_VolumeSize);
@ -273,11 +271,6 @@ const std::string& GameListItem::GetDescription(int index) const
return m_Description[0];
}
const std::wstring& GameListItem::GetDescription() const
{
return m_wDescription;
}
const std::string& GameListItem::GetName(int index) const
{
if ((index >=0) && (index < 6))

4
Source/Core/DolphinWX/Src/ISOFile.h
View File

@ -37,8 +37,7 @@ public:
const std::string& GetName(int index) const;
bool GetName(std::wstring& wName, int index=0) const;
const std::string& GetCompany() const {return m_Company;}
const std::string& GetDescription(int index) const;
const std::wstring& GetDescription() const;
const std::string& GetDescription(int index = 0) const;
const std::string& GetUniqueID() const {return m_UniqueID;}
const std::string GetWiiFSPath() const;
DiscIO::IVolume::ECountry GetCountry() const {return m_Country;}
@ -69,7 +68,6 @@ private:
std::vector<std::wstring> m_wNames;
std::string m_Company;
std::string m_Description[6];
std::wstring m_wDescription;
std::string m_UniqueID;
std::string m_issues;

6
Source/Core/DolphinWX/Src/ISOProperties.cpp
View File

@ -1339,8 +1339,7 @@ void CISOProperties::ChangeBannerDetails(int lang)
else
shortName = wxString(OpenGameListItem->GetName(0).c_str(), SJISConv);
if ((comment = OpenGameListItem->GetDescription().c_str()).size() == 0)
comment = wxString(OpenGameListItem->GetDescription(0).c_str(), SJISConv);
comment = StrToWxStr(OpenGameListItem->GetDescription());
maker = wxString(OpenGameListItem->GetCompany().c_str(), SJISConv);
break;
case DiscIO::IVolume::COUNTRY_USA:
@ -1352,8 +1351,7 @@ void CISOProperties::ChangeBannerDetails(int lang)
shortName = wname.c_str();
else
shortName = wxString(OpenGameListItem->GetName(lang).c_str(), WindowsCP1252);
if ((comment = OpenGameListItem->GetDescription().c_str()).size() == 0)
comment = wxString(OpenGameListItem->GetDescription(lang).c_str(), WindowsCP1252);
comment = StrToWxStr(OpenGameListItem->GetDescription(lang));
maker = wxString(OpenGameListItem->GetCompany().c_str(), WindowsCP1252);
}
break;