summaryrefslogtreecommitdiff
path: root/Source/Core/DiscIO/Src/NANDContentLoader.cpp
diff options
context:
space:
mode:
authorLPFaint99 <lpfaint99@gmail.com>2011-05-05 22:38:07 +0000
committerLPFaint99 <lpfaint99@gmail.com>2011-05-05 22:38:07 +0000
commitc88126233b34dd950efc0fff9f91d1ca21a455b0 (patch)
tree0f71d095ddd1fa68a23079e2c32a301768c50e5b /Source/Core/DiscIO/Src/NANDContentLoader.cpp
parentff63ef20c2bf33377c6c15aab5db08b2f8baad3b (diff)
Update the country code in SysConf when wii system language is changed.
remove annoying assert for invalid loaders on disc titles. Fixes issue 4287. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7514 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DiscIO/Src/NANDContentLoader.cpp')
-rw-r--r--Source/Core/DiscIO/Src/NANDContentLoader.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.cpp b/Source/Core/DiscIO/Src/NANDContentLoader.cpp
index a4c0a7f4e8..1b77a2bfa3 100644
--- a/Source/Core/DiscIO/Src/NANDContentLoader.cpp
+++ b/Source/Core/DiscIO/Src/NANDContentLoader.cpp
@@ -219,7 +219,7 @@ bool CNANDContentLoader::CreateFromDirectory(const std::string& _rPath)
m_IosVersion = Common::swap16(pTMD + 0x018a);
m_Country = *(u8*)&m_TitleID;
if (m_Country == 2) // SYSMENU
- m_Country = DiscIO::GetSysMenuRegion(m_TileVersion);
+ m_Country = GetSysMenuRegion(m_TileVersion);
m_Content.resize(m_numEntries);
@@ -305,7 +305,7 @@ bool CNANDContentLoader::ParseTMD(u8* pDataApp, u32 pDataAppSize, u8* pTicket, u
m_IosVersion = Common::swap16(pTMD + 0x018a);
m_Country = *(u8*)&m_TitleID;
if (m_Country == 2) // SYSMENU
- m_Country = DiscIO::GetSysMenuRegion(m_TileVersion);
+ m_Country = GetSysMenuRegion(m_TileVersion);
u8* p = pDataApp;