From 52e798249ceeef68b9329655338cfacdae5d66f4 Mon Sep 17 00:00:00 2001 From: ragnarok-clanker Date: Sun, 8 Nov 2026 11:53:11 +0000 Subject: [PATCH] Decompile 4 functions in Source/Utility/JsonCppLoader.cpp Batch #14910 by SapitoSucio: 0 byte-identical, 4 confirmed by peer review. - fn_00886 JsonCppLoader::GetIntValue: logic confirmed by peer review - fn_00887 JsonCppLoader::GetStringValue: logic confirmed by peer review - fn_00891 JsonCppLoader::GetMapStringBoolValue: logic confirmed by peer review - fn_00893 JsonCppLoader::GetBoolValue: logic confirmed by peer review Peer-reviewed-by: ragnarok-clanker, raiken, Stingor Accepted without human review: peers confirmed the logic ("same" ahead by at least 3, with 70% of the votes). --- Source/Utility/JsonCppLoader.cpp | 50 ++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/Source/Utility/JsonCppLoader.cpp b/Source/Utility/JsonCppLoader.cpp index 8a20bfce6..511e557a8 100644 --- a/Source/Utility/JsonCppLoader.cpp +++ b/Source/Utility/JsonCppLoader.cpp @@ -3,17 +3,29 @@ #include #include #include + +extern "C" void JsonDestroy(); + +struct JsonValueLocal { + JsonValue value; + + // INLINED + ~JsonValueLocal() { + reinterpret_cast(JsonDestroy)(&this->value); + } +}; + // OFFSET: 0x00509940 // FUNCTION: fn_00891 bool JsonCppLoader::GetMapStringBoolValue(const JsonValue& node, const std::string& key, std::map* out) { - JsonValue value; - this->GetValue(value, key, node, JsonValue::OBJECT_VALUE); - if (value.IsNull()) { + JsonValueLocal value; + this->GetValue(value.value, key, node, JsonValue::OBJECT_VALUE); + if (value.value.IsNull() == true) { this->Fail("key 에 해당하는 데이터를 찾지 못했습니다. (keyName : %s)", key.c_str()); return false; } - const JsonObject& members = value.GetObject(); + const JsonObject& members = value.value.GetObject(); for (JsonObject::const_iterator member = members.begin(); member != members.end(); ++member) { std::string name = member->first; JsonValue element = member->second; @@ -35,14 +47,14 @@ bool JsonCppLoader::GetMapStringBoolValue(const JsonValue& node, const std::stri // OFFSET: 0x005086D0 // FUNCTION: fn_00887 bool JsonCppLoader::GetStringValue(const JsonValue& node, const std::string& key, std::string* out) { - JsonValue value; - this->GetValue(value, key, node, JsonValue::STRING_VALUE); - if (value.IsNull()) { + JsonValueLocal value; + this->GetValue(value.value, key, node, JsonValue::STRING_VALUE); + if (value.value.IsNull() == true) { this->Fail("key 에 해당하는 데이터를 찾지 못했습니다. (keyName : %s)", key.c_str()); return false; } - *out = value.AsString(); + *out = value.value.AsString(); return true; } @@ -265,14 +277,14 @@ void JsonCppLoader::Fail(const char* format, ...) { // OFFSET: 0x00508570 // FUNCTION: fn_00886 bool JsonCppLoader::GetIntValue(const JsonValue& node, const std::string& key, int* out) { - JsonValue value; - this->GetValue(value, key, node, JsonValue::INT64_VALUE); - if (value.IsNull()) { + JsonValueLocal value; + this->GetValue(value.value, key, node, JsonValue::INT64_VALUE); + if (value.value.IsNull() == true) { this->Fail("key 에 해당하는 데이터를 찾지 못했습니다. (keyName : %s)", key.c_str()); return false; } - *out = value.AsInt(); + *out = value.value.AsInt(); return true; } @@ -309,7 +321,7 @@ bool JsonCppLoader::GetMapStringIntValue(const JsonValue& node, const std::strin bool JsonCppLoader::GetMapStringStringValue(const JsonValue& node, const std::string& key, std::map* out) { JsonValue value; this->GetValue(value, key, node, JsonValue::OBJECT_VALUE); - if (value.IsNull()) { + if (value.IsNull() == true) { this->Fail("key 에 해당하는 데이터를 찾지 못했습니다. (keyName : %s)", key.c_str()); return false; } @@ -337,7 +349,7 @@ bool JsonCppLoader::GetMapStringStringValue(const JsonValue& node, const std::st bool JsonCppLoader::GetMapStringIntVectorValue(const JsonValue& node, const std::string& key, std::map >* out) { JsonValue value; this->GetValue(value, key, node, JsonValue::OBJECT_VALUE); - if (value.IsNull()) { + if (value.IsNull() == true) { this->Fail("key 에 해당하는 데이터를 찾지 못했습니다. (keyName : %s)", key.c_str()); return false; } @@ -376,7 +388,7 @@ bool JsonCppLoader::GetMapStringIntVectorValue(const JsonValue& node, const std: bool JsonCppLoader::GetIntVectorValue(const JsonValue& node, const std::string& key, std::vector* out) { JsonValue value; this->GetValue(value, key, node, JsonValue::ARRAY_VALUE); - if (value.IsNull()) { + if (value.IsNull() == true) { this->Fail("key 에 해당하는 데이터를 찾지 못했습니다. (keyName : %s)", key.c_str()); return false; } @@ -397,13 +409,13 @@ bool JsonCppLoader::GetIntVectorValue(const JsonValue& node, const std::string& // OFFSET: 0x00509F70 // FUNCTION: fn_00893 bool JsonCppLoader::GetBoolValue(const JsonValue& node, const std::string& key, bool* out) { - JsonValue value; - this->GetValue(value, key, node, JsonValue::BOOL_VALUE); - if (value.IsNull()) { + JsonValueLocal value; + this->GetValue(value.value, key, node, JsonValue::BOOL_VALUE); + if (value.value.IsNull() == true) { this->Fail("key 에 해당하는 데이터를 찾지 못했습니다. (keyName : %s)", key.c_str()); return false; } - *out = value.AsBool(); + *out = value.value.AsBool(); return true; }