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

cleanup: merge handling of ntsc/pal games in gamelist/isoproperties

Browse Source
This commit is contained in:
LPFaint99
2011-12-20 02:19:46 -08:00
parent e4c4602d9e
commit 8f6c25a5aa
2 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1266,7 +1266,6 @@ void CISOProperties::ChangeBannerDetails(int lang)
comment,
maker;
wxCSConv WindowsCP1252(wxFontMapper::GetEncodingName(wxFONTENCODING_CP1252));
#ifdef _WIN32
wxCSConv SJISConv(*(wxCSConv*)wxConvCurrent);
static bool validCP932 = ::IsValidCodePage(932) != 0;
@ -1298,15 +1297,10 @@ void CISOProperties::ChangeBannerDetails(int lang)
maker = wxString(OpenGameListItem->GetCompany().c_str(), SJISConv);
break;
case DiscIO::IVolume::COUNTRY_USA:
if (OpenGameListItem->GetName(wname))
shortName = wname;
else
shortName = wxString(OpenGameListItem->GetName(0).c_str(), WindowsCP1252);
if ((comment = OpenGameListItem->GetDescription()).size() == 0)
comment = wxString(OpenGameListItem->GetDescription(0).c_str(), WindowsCP1252);
maker = wxString(OpenGameListItem->GetCompany().c_str(), WindowsCP1252);
break;
lang = 0;
default:
{
wxCSConv WindowsCP1252(wxFontMapper::GetEncodingName(wxFONTENCODING_CP1252));
if (OpenGameListItem->GetName(wname, lang))
shortName = wname;
else
@ -1314,8 +1308,7 @@ void CISOProperties::ChangeBannerDetails(int lang)
if ((comment = OpenGameListItem->GetDescription()).size() == 0)
comment = wxString(OpenGameListItem->GetDescription(lang).c_str(), WindowsCP1252);
maker = wxString(OpenGameListItem->GetCompany().c_str(), WindowsCP1252);
break;
}
break;
}
// Updates the informations shown in the window