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

Merge pull request #5093 from JosJuice/six-char-game-ids

Browse Source 
Use 6-char game IDs for NAND tiles (if they are printable)
This commit is contained in:
Matthew Parlane
2017-03-20 13:38:35 +13:00
committed by GitHub
parent 4412463310 ff7425214a
commit 9da35edd15
4 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@
#include <cstddef>
#include <cstring>
#include <locale>
#include <map>
#include <memory>
#include <string>
@ -89,22 +90,18 @@ IOS::ES::TMDReader CVolumeWAD::GetTMD() const
std::string CVolumeWAD::GetGameID() const
{
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);
return DecodeString(GameCode);
return m_tmd.GetGameID();
}
std::string CVolumeWAD::GetMakerID() const
{
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)
char temp[2];
if (!Read(0x198 + m_tmd_offset, 2, (u8*)temp))
return "00";
// Some weird channels use 0x0000 in place of the MakerID, so we need a check here
const std::locale& c_locale = std::locale::classic();
if (!std::isprint(temp[0], c_locale) || !std::isprint(temp[1], c_locale))
return "00";
return DecodeString(temp);