R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed VPK manifest bug

Browse Source 
Fixed bug where VPK root character gets written to the manifest file.
Show detailed data sharing statistics.
This commit is contained in:
Kawe Mazidjatari 2022-06-05 20:55:34 +02:00
parent d005626aa0
commit 13f518d773
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
r5dev/vpklib/packedstore.cpp
View File

@ -468,6 +468,8 @@ void CPackedStore::PackAll(const VPKPair_t& vPair, const string& svPathIn, const
nSharedTotal += it->second.m_nCompressedSize;
nSharedCount++;
bShared = true;
DevMsg(eDLL_T::FS, "Mapping block '%lld' to existing block at '0x%llx' ('%s')\n", i, it->second.m_nArchiveOffset, svEntryHash.c_str());
}
else // Add entry to hashmap.
{
@ -514,7 +516,6 @@ void CPackedStore::UnpackAll(const VPKDir_t& vpkDir, const string& svPathOut)
string svPath = fspVpkPath.parent_path().u8string() + '\\' + vpkDir.m_vsvArchives[i];
CIOStream iStream(svPath, CIOStream::Mode_t::READ); // Create stream to read from each archive.
//for ( VPKEntryBlock_t vBlock : vpkDir.m_vvEntryBlocks)
for ( size_t j = 0; j < vpkDir.m_vvEntryBlocks.size(); j++)
{
if (vpkDir.m_vvEntryBlocks[j].m_iArchiveIndex != static_cast<uint16_t>(i))
@ -588,7 +589,8 @@ void CPackedStore::UnpackAll(const VPKDir_t& vpkDir, const string& svPathOut)
//-----------------------------------------------------------------------------
VPKEntryBlock_t::VPKEntryBlock_t(CIOStream* pReader, string svBlockPath)
{
std::replace(svBlockPath.begin(), svBlockPath.end(), '\\', '/'); // Flip windows-style backslash to forward slash.
StringReplace(svBlockPath, "\\", "/"); // Flip windows-style backslash to forward slash.
StringReplace(svBlockPath, " /", "" ); // Remove space character representing VPK root.
this->m_svBlockPath = svBlockPath; // Set path of block.
pReader->Read<uint32_t>(this->m_nCrc32); //

2
r5dev/vstdlib/callback.cpp
View File

@ -638,6 +638,7 @@ void VPK_Pack_f(const CCommand& args)
float duration = msEnd.count() - msStart.count();
DevMsg(eDLL_T::FS, "*** Time elapsed: '%.3f' seconds\n", (duration / 1000));
DevMsg(eDLL_T::FS, "\n");
}
/*
@ -668,6 +669,7 @@ void VPK_Unpack_f(const CCommand& args)
float duration = msEnd.count() - msStart.count();
DevMsg(eDLL_T::FS, "*** Time elapsed: '%.3f' seconds\n", (duration / 1000));
DevMsg(eDLL_T::FS, "\n");
}
/*