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

Revert declaration

Browse Source
This commit is contained in:
Kawe Mazidjatari 2022-06-04 01:30:18 +02:00
parent 2e77c584b4
commit b3dd9c8ad6
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
r5dev/common/sdkdefs.h
View File

@ -17,7 +17,6 @@ using std::ostringstream;
using std::unordered_map;
namespace fs = std::filesystem;
namespace js = nlohmann;
typedef const unsigned char* rsig_t;
#endif // SDKDEFS_H

14
r5dev/vpklib/packedstore.cpp
View File

@ -147,7 +147,7 @@ vector<string> CPackedStore::GetEntryPaths(const string& svPathIn) const
// &jManifest -
// Output : vector<string>
//-----------------------------------------------------------------------------
vector<string> CPackedStore::GetEntryPaths(const string& svPathIn, const js::json& jManifest) const
vector<string> CPackedStore::GetEntryPaths(const string& svPathIn, const nlohmann::json& jManifest) const
{
vector<string> vPaths;
fs::recursive_directory_iterator dir(svPathIn), end;
@ -199,7 +199,7 @@ string CPackedStore::GetLevelName(const string& svDirectoryName) const
// Input : &svManifestName -
// Output : json
//-----------------------------------------------------------------------------
js::json CPackedStore::GetManifest(const string& svWorkSpace, const string& svManifestName) const
nlohmann::json CPackedStore::GetManifest(const string& svWorkSpace, const string& svManifestName) const
{
ostringstream ostream;
ostream << svWorkSpace << "manifest/" << svManifestName << ".json";
@ -207,11 +207,11 @@ js::json CPackedStore::GetManifest(const string& svWorkSpace, const string& svMa
if (fs::exists(fsPath))
{
js::json jsOut;
nlohmann::json jsOut;
try
{
ifstream iManifest(fsPath.string().c_str(), std::ios::binary);
jsOut = js::json::parse(iManifest);
jsOut = nlohmann::json::parse(iManifest);
return jsOut;
}
@ -294,7 +294,7 @@ VPKPair_t CPackedStore::BuildFileName(string svLanguage, string svContext, const
//-----------------------------------------------------------------------------
void CPackedStore::BuildManifest(const vector<VPKEntryBlock_t>& vBlock, const string& svWorkSpace, const string& svManifestName) const
{
js::json jEntry;
nlohmann::json jEntry;
for (size_t i = 0; i < vBlock.size(); i++)
{
@ -362,7 +362,7 @@ void CPackedStore::PackAll(const VPKPair_t& vPair, const string& svPathIn, const
string svLevelName = GetLevelName(vPair.m_svDirectoryName);
vector<string> vPaths;
vector<VPKEntryBlock_t> vEntryBlocks;
js::json jManifest = GetManifest(svPathIn, svLevelName);
nlohmann::json jManifest = GetManifest(svPathIn, svLevelName);
if (bManifestOnly)
{
@ -387,7 +387,7 @@ void CPackedStore::PackAll(const VPKPair_t& vPair, const string& svPathIn, const
{
try
{
js::json jEntry = jManifest[StringReplaceC(vPaths[i], svPathIn, "")];
nlohmann::json jEntry = jManifest[StringReplaceC(vPaths[i], svPathIn, "")];
if (!jEntry.is_null())
{
nPreloadData = jEntry.at("preloadData").get<uint32_t>();

4
r5dev/vpklib/packedstore.h
View File

@ -128,9 +128,9 @@ public:
string GetPackChunkFile(const string& svPackDirFile, int iArchiveIndex) const;
vector<VPKEntryBlock_t> GetEntryBlocks(CIOStream* reader) const;
vector<string> GetEntryPaths(const string& svPathIn) const;
vector<string> GetEntryPaths(const string& svPathIn, const js::json& jManifest) const;
vector<string> GetEntryPaths(const string& svPathIn, const nlohmann::json& jManifest) const;
string GetLevelName(const string& svDirectoryName) const;
js::json GetManifest(const string& svWorkSpace, const string& svManifestName) const;
nlohmann::json GetManifest(const string& svWorkSpace, const string& svManifestName) const;
string FormatBlockPath(string svName, const string& svPath, const string& svExtension) const;
string StripLocalePrefix(const string& svPackDirFile) const;