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

Eliminate the wstring game name.

Browse Source 
Some cleanup throughout related code. (try to make logic in ISOFile understandable by a human)
Encode strings in UTF-8 rather than somehow trying to determine the encoding in the GUI code.

Non-windows OSes temporarily broken.
This commit is contained in:
Jordan Woyak
2013-03-02 19:46:55 -06:00
parent 2b1af36900
commit 6c8adf6130
22 changed files with 243 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
Source/Core/DiscIO/Src/BannerLoaderGC.cpp
View File

@ -29,7 +29,7 @@ CBannerLoaderGC::CBannerLoaderGC(DiscIO::IFileSystem& _rFileSystem)
{
// load the opening.bnr
size_t FileSize = (size_t) _rFileSystem.GetFileSize("opening.bnr");
if (FileSize == sizeof(DVDBanner) || FileSize == sizeof(DVDBanner2))
if (FileSize == BNR1_SIZE || FileSize == BNR2_SIZE)
{
m_pBannerFile = new u8[FileSize];
if (m_pBannerFile)
@ -62,7 +62,6 @@ bool CBannerLoaderGC::IsValid()
return m_IsValid;
}
bool CBannerLoaderGC::GetBanner(u32* _pBannerImage)
{
if (!IsValid())
@ -70,132 +69,111 @@ bool CBannerLoaderGC::GetBanner(u32* _pBannerImage)
return false;
}
DVDBanner2* pBanner = (DVDBanner2*)m_pBannerFile;
auto const pBanner = (DVDBanner*)m_pBannerFile;
decode5A3image(_pBannerImage, pBanner->image, DVD_BANNER_WIDTH, DVD_BANNER_HEIGHT);
return true;
}
bool CBannerLoaderGC::GetName(std::string _rName[])
std::vector<std::string> CBannerLoaderGC::GetNames()
{
bool returnCode = false;
std::vector<std::string> names;
if (!IsValid())
{
return false;
return names;
}
u32 name_count = 0;
// find Banner type
switch (m_BNRType)
{
case CBannerLoaderGC::BANNER_BNR1:
{
DVDBanner* pBanner = (DVDBanner*)m_pBannerFile;
char tempBuffer[65] = {0};
if (pBanner->comment.longTitle[0])
{
memcpy(tempBuffer, pBanner->comment.longTitle, 64);
}
else
{
memcpy(tempBuffer, pBanner->comment.shortTitle, 32);
}
for (int i = 0; i < 6; i++)
{
CopyToStringAndCheck(_rName[i], tempBuffer);
}
returnCode = true;
}
name_count = 1;
break;
case CBannerLoaderGC::BANNER_BNR2:
{
DVDBanner2* pBanner = (DVDBanner2*)m_pBannerFile;
for (int i = 0; i < 6; i++)
{
char tempBuffer[65] = {0};
if (pBanner->comment[i].longTitle[0])
{
memcpy(tempBuffer, pBanner->comment[i].longTitle, 64);
}
else
{
memcpy(tempBuffer, pBanner->comment[i].shortTitle, 32);
}
CopyToStringAndCheck(_rName[i], tempBuffer);
}
returnCode = true;
}
name_count = 6;
break;
default:
break;
}
auto const banner = reinterpret_cast<const DVDBanner*>(m_pBannerFile);
for (int i = 0; i != name_count; ++i)
{
auto& comment = banner->comment[i];
if (comment.longTitle[0])
{
auto& data = comment.longTitle;
names.push_back(GetDecodedString(data));
}
else
{
auto& data = comment.shortTitle;
names.push_back(GetDecodedString(data));
}
}
return returnCode;
return names;
}
bool CBannerLoaderGC::GetCompany(std::string& _rCompany)
std::string CBannerLoaderGC::GetCompany()
{
_rCompany = "N/A";
std::string company;
if (!IsValid())
if (IsValid())
{
return(false);
auto const pBanner = (DVDBanner*)m_pBannerFile;
auto& data = pBanner->comment[0].shortMaker;
company = GetDecodedString(data);
}
DVDBanner2* pBanner = (DVDBanner2*)m_pBannerFile;
CopyToStringAndCheck(_rCompany, pBanner->comment[0].shortMaker);
return true;
return company;
}
bool CBannerLoaderGC::GetDescription(std::string* _rDescription)
std::vector<std::string> CBannerLoaderGC::GetDescriptions()
{
bool returnCode = false;
std::vector<std::string> descriptions;
if (!IsValid())
{
return false;
return descriptions;
}
u32 desc_count = 0;
// find Banner type
switch (m_BNRType)
{
case CBannerLoaderGC::BANNER_BNR1:
{
DVDBanner* pBanner = (DVDBanner*)m_pBannerFile;
char tempBuffer[129] = {0};
memcpy(tempBuffer, pBanner->comment.comment, 128);
for (int i = 0; i < 6; i++)
{
CopyToStringAndCheck(_rDescription[i], tempBuffer);
}
returnCode = true;
}
desc_count = 1;
break;
case CBannerLoaderGC::BANNER_BNR2:
{
DVDBanner2* pBanner = (DVDBanner2*)m_pBannerFile;
for (int i = 0; i< 6; i++)
{
char tempBuffer[129] = {0};
memcpy(tempBuffer, pBanner->comment[i].comment, 128);
CopyToStringAndCheck(_rDescription[i], tempBuffer);
}
returnCode = true;
}
case CBannerLoaderGC::BANNER_BNR2:
desc_count = 6;
break;
default:
break;
}
return returnCode;
auto banner = reinterpret_cast<const DVDBanner*>(m_pBannerFile);
for (int i = 0; i != desc_count; ++i)
{
auto& data = banner->comment[i].comment;
descriptions.push_back(GetDecodedString(data));
}
return descriptions;
}
@ -223,13 +201,17 @@ CBannerLoaderGC::BANNER_TYPE CBannerLoaderGC::getBannerType()
CBannerLoaderGC::BANNER_TYPE type = CBannerLoaderGC::BANNER_UNKNOWN;
switch (bannerSignature)
{
// "BNR1"
case 0x31524e42:
type = CBannerLoaderGC::BANNER_BNR1;
break;
// "BNR2"
case 0x32524e42:
type = CBannerLoaderGC::BANNER_BNR2;
break;
}
return type;
}
} // namespace