From 83b55c493799e920ae5e4925020390e4370cbe31 Mon Sep 17 00:00:00 2001 From: Spuckwaffel <68144475+Spuckwaffel@users.noreply.github.com> Date: Thu, 16 Nov 2023 16:42:33 +0100 Subject: [PATCH 1/2] fixup --- UEDumper/Resources/Dumpspace/dumpspace.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/UEDumper/Resources/Dumpspace/dumpspace.cpp b/UEDumper/Resources/Dumpspace/dumpspace.cpp index 5b2be851..642616c8 100644 --- a/UEDumper/Resources/Dumpspace/dumpspace.cpp +++ b/UEDumper/Resources/Dumpspace/dumpspace.cpp @@ -12,9 +12,9 @@ namespace Dumpspace std::string dumpTimeStamp = {}; // Last std::string isn't used atm, but dumps.host expects it. - std::vector> offsets = {}; + std::vector> offsets = {}; void AddOffset(const std::string& string, uint64_t offset) { - offsets.push_back(std::make_tuple(string, offset, "Offset")); + offsets.push_back(std::pair(string, offset)); } nlohmann::json classes = nlohmann::json::array(); @@ -175,9 +175,9 @@ namespace Dumpspace for (auto& param : func.params) { std::string functionParamType = ""; - if (std::get<3>(param) > 1) - functionParamType += "*"; - else if (std::get<2>(param) & EPropertyFlags::CPF_OutParm) + //if (std::get<3>(param) > 1) + // functionParamType += "*"; + if (std::get<2>(param) & EPropertyFlags::CPF_OutParm) functionParamType += "&"; functionParams.push_back(std::make_tuple(std::get<0>(param).jsonify(), functionParamType, std::get<1>(param))); From a12dbe43e4c84aa14781aac367e653e66e4e033f Mon Sep 17 00:00:00 2001 From: Spuckwaffel <68144475+Spuckwaffel@users.noreply.github.com> Date: Thu, 16 Nov 2023 18:20:59 +0100 Subject: [PATCH 2/2] dumspace fixed --- UEDumper/Resources/Dumpspace/dumpspace.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UEDumper/Resources/Dumpspace/dumpspace.cpp b/UEDumper/Resources/Dumpspace/dumpspace.cpp index 642616c8..97b7dcd7 100644 --- a/UEDumper/Resources/Dumpspace/dumpspace.cpp +++ b/UEDumper/Resources/Dumpspace/dumpspace.cpp @@ -204,11 +204,11 @@ namespace Dumpspace for (int i = 0; i < enu.members.size(); i++) { nlohmann::json a; - a[enu.members[i].first] = std::make_tuple(enu.members[i].second, enu.type); + a[enu.members[i].first] = enu.members[i].second; members.push_back(a); } nlohmann::json j; - j[enu.cppName] = members; + j[enu.cppName] = std::make_tuple(members, enu.type); AddEnum(j); } progressDone++;