diff options
| author | Stevoisiak <Stevoisiak@gmail.com> | 2014-11-14 14:46:49 -0500 |
|---|---|---|
| committer | Stevoisiak <S.Vascellaro@gmail.com> | 2014-11-24 17:16:59 -0500 |
| commit | 6da394a4d0891ed30fbb08f4ec853f40699f7033 (patch) | |
| tree | 3e95fff7fde66a1e121e2aa78b5c221fab8be8c9 /Source/Core/DiscIO/NANDContentLoader.cpp | |
| parent | 60e9301f40601a1a3d6546a37ea71f18a43f9b3b (diff) | |
More formatting and consistency fixes
Diffstat (limited to 'Source/Core/DiscIO/NANDContentLoader.cpp')
| -rw-r--r-- | Source/Core/DiscIO/NANDContentLoader.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/Source/Core/DiscIO/NANDContentLoader.cpp b/Source/Core/DiscIO/NANDContentLoader.cpp index be37fed1f4..26c93489a8 100644 --- a/Source/Core/DiscIO/NANDContentLoader.cpp +++ b/Source/Core/DiscIO/NANDContentLoader.cpp @@ -129,7 +129,7 @@ private: u8 m_TMDView[TMD_VIEW_SIZE]; u8 m_TMDHeader[TMD_HEADER_SIZE]; u32 m_TIKSize; - u8 *m_TIK; + u8* m_TIK; u8 m_Country; std::vector<SNANDContent> m_Content; @@ -267,19 +267,13 @@ bool CNANDContentLoader::Initialize(const std::string& _rName) rContent.m_pData = nullptr; if (rContent.m_Type & 0x8000) // shared app - { rContent.m_Filename = CSharedContent::AccessInstance().GetFilenameFromSHA1(rContent.m_SHA1Hash); - } else - { rContent.m_Filename = StringFromFormat("%s/%08x.app", m_Path.c_str(), rContent.m_ContentID); - } // Be graceful about incorrect tmds. if (File::Exists(rContent.m_Filename)) - { rContent.m_Size = (u32) File::GetSize(rContent.m_Filename); - } } delete [] pTMD; @@ -484,13 +478,9 @@ u64 CNANDContentManager::Install_WiiWAD(std::string &fileName) std::string APPFileName; if (Content.m_Type & 0x8000) //shared - { APPFileName = CSharedContent::AccessInstance().AddSharedContent(Content.m_SHA1Hash); - } else - { APPFileName = StringFromFormat("%s%08x.app", ContentPath.c_str(), Content.m_ContentID); - } if (!File::Exists(APPFileName)) { @@ -522,7 +512,7 @@ u64 CNANDContentManager::Install_WiiWAD(std::string &fileName) return TitleID; } -bool Add_Ticket(u64 TitleID, const u8 *p_tik, u32 tikSize) +bool Add_Ticket(u64 TitleID, const u8* p_tik, u32 tikSize) { std::string TicketFileName = Common::GetTicketFileName(TitleID); File::CreateFullPath(TicketFileName); |