summaryrefslogtreecommitdiff
path: root/Source/Core/DiscIO/NANDContentLoader.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Core/DiscIO/NANDContentLoader.cpp')
-rw-r--r--Source/Core/DiscIO/NANDContentLoader.cpp38
1 files changed, 19 insertions, 19 deletions
diff --git a/Source/Core/DiscIO/NANDContentLoader.cpp b/Source/Core/DiscIO/NANDContentLoader.cpp
index b874d82c49..ac5da99f2c 100644
--- a/Source/Core/DiscIO/NANDContentLoader.cpp
+++ b/Source/Core/DiscIO/NANDContentLoader.cpp
@@ -37,15 +37,15 @@ CSharedContent::CSharedContent()
void CSharedContent::UpdateLocation()
{
m_Elements.clear();
- lastID = 0;
- contentMap = StringFromFormat("%sshared1/content.map", File::GetUserPath(D_WIIUSER_IDX).c_str());
+ m_lastID = 0;
+ m_contentMap = StringFromFormat("%sshared1/content.map", File::GetUserPath(D_WIIUSER_IDX).c_str());
- File::IOFile pFile(contentMap, "rb");
+ File::IOFile pFile(m_contentMap, "rb");
SElement Element;
while (pFile.ReadArray(&Element, 1))
{
m_Elements.push_back(Element);
- lastID++;
+ m_lastID++;
}
}
@@ -72,19 +72,19 @@ std::string CSharedContent::AddSharedContent(const u8* _pHash)
if (strcasecmp(filename.c_str(), "unk") == 0)
{
- std::string id = StringFromFormat("%08x", lastID);
+ std::string id = StringFromFormat("%08x", m_lastID);
SElement Element;
memcpy(Element.FileName, id.c_str(), 8);
memcpy(Element.SHA1Hash, _pHash, 20);
m_Elements.push_back(Element);
- File::CreateFullPath(contentMap);
+ File::CreateFullPath(m_contentMap);
- File::IOFile pFile(contentMap, "ab");
+ File::IOFile pFile(m_contentMap, "ab");
pFile.WriteArray(&Element, 1);
filename = StringFromFormat("%sshared1/%s.app", File::GetUserPath(D_WIIUSER_IDX).c_str(), id.c_str());
- lastID++;
+ m_lastID++;
}
return filename;
@@ -382,14 +382,14 @@ cUIDsys::cUIDsys()
void cUIDsys::UpdateLocation()
{
m_Elements.clear();
- lastUID = 0x00001000;
- uidSys = StringFromFormat("%ssys/uid.sys", File::GetUserPath(D_WIIUSER_IDX).c_str());
+ m_lastUID = 0x00001000;
+ m_uidSys = StringFromFormat("%ssys/uid.sys", File::GetUserPath(D_WIIUSER_IDX).c_str());
- File::IOFile pFile(uidSys, "rb");
+ File::IOFile pFile(m_uidSys, "rb");
SElement Element;
while (pFile.ReadArray(&Element, 1))
{
- *(u32*)&(Element.UID) = Common::swap32(lastUID++);
+ *(u32*)&(Element.UID) = Common::swap32(m_lastUID++);
m_Elements.push_back(Element);
}
pFile.Close();
@@ -397,12 +397,12 @@ void cUIDsys::UpdateLocation()
if (m_Elements.empty())
{
*(u64*)&(Element.titleID) = Common::swap64(TITLEID_SYSMENU);
- *(u32*)&(Element.UID) = Common::swap32(lastUID++);
+ *(u32*)&(Element.UID) = Common::swap32(m_lastUID++);
- File::CreateFullPath(uidSys);
- pFile.Open(uidSys, "wb");
+ File::CreateFullPath(m_uidSys);
+ pFile.Open(m_uidSys, "wb");
if (!pFile.WriteArray(&Element, 1))
- ERROR_LOG(DISCIO, "Failed to write to %s", uidSys.c_str());
+ ERROR_LOG(DISCIO, "Failed to write to %s", m_uidSys.c_str());
}
}
@@ -431,11 +431,11 @@ void cUIDsys::AddTitle(u64 _TitleID)
SElement Element;
*(u64*)&(Element.titleID) = Common::swap64(_TitleID);
- *(u32*)&(Element.UID) = Common::swap32(lastUID++);
+ *(u32*)&(Element.UID) = Common::swap32(m_lastUID++);
m_Elements.push_back(Element);
- File::CreateFullPath(uidSys);
- File::IOFile pFile(uidSys, "ab");
+ File::CreateFullPath(m_uidSys);
+ File::IOFile pFile(m_uidSys, "ab");
if (!pFile.WriteArray(&Element, 1))
ERROR_LOG(DISCIO, "fwrite failed");