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

Volume: Use DecodeString more

Browse Source 
DecodeString handles the case where there is no trailing null byte,
so using it lets the code be a bit simpler.
This commit is contained in:
JosJuice
2015-06-18 14:45:26 +02:00
parent 6d9711c02c
commit a825c7ddfe
3 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/DiscIO/VolumeWad.cpp
View File

@ -70,29 +70,25 @@ IVolume::ECountry CVolumeWAD::GetCountry() const
std::string CVolumeWAD::GetUniqueID() const
{
std::string temp = GetMakerID();
char GameCode[8];
char GameCode[6];
if (!Read(m_offset + 0x01E0, 4, (u8*)GameCode))
return "0";
std::string temp = GetMakerID();
GameCode[4] = temp.at(0);
GameCode[5] = temp.at(1);
GameCode[6] = 0;
return GameCode;
return DecodeString(GameCode);
}
std::string CVolumeWAD::GetMakerID() const
{
char temp[3] = {1};
char temp[2] = {1};
// Some weird channels use 0x0000 in place of the MakerID, so we need a check there
if (!Read(0x198 + m_tmd_offset, 2, (u8*)temp) || temp[0] == 0 || temp[1] == 0)
return "00";
temp[2] = 0;
return temp;
return DecodeString(temp);
}
bool CVolumeWAD::GetTitleID(u8* _pBuffer) const