From 4e57b4aa7e43c954720403cf4122a8eb031bf684 Mon Sep 17 00:00:00 2001 From: Aaron Kimbre Date: Thu, 2 Jan 2025 22:19:04 -0600 Subject: [PATCH 1/4] feedback --- dCommon/GeneralUtils.h | 1 - dCommon/Logger.h | 1 - 2 files changed, 2 deletions(-) diff --git a/dCommon/GeneralUtils.h b/dCommon/GeneralUtils.h index 1565a3d7..b888ddf5 100644 --- a/dCommon/GeneralUtils.h +++ b/dCommon/GeneralUtils.h @@ -18,7 +18,6 @@ #include "dPlatforms.h" #include "Game.h" #include "Logger.h" -#include "json_fwd.hpp" enum eInventoryType : uint32_t; enum class eObjectBits : size_t; diff --git a/dCommon/Logger.h b/dCommon/Logger.h index 7782f470..5754d9ac 100644 --- a/dCommon/Logger.h +++ b/dCommon/Logger.h @@ -80,7 +80,6 @@ public: void SetLogToConsole(bool logToConsole); void SetLogDebugStatements(bool logDebugStatements) { m_logDebugStatements = logDebugStatements; } - bool GetLogDebugStatements() const { return m_logDebugStatements; } private: void vLog(const char* format, va_list args); From 41a001e242c1074ce8f020ec929769bcbab65507 Mon Sep 17 00:00:00 2001 From: Aaron Kimbrell Date: Thu, 2 Jan 2025 22:20:31 -0600 Subject: [PATCH 2/4] Update dNet/CMakeLists.txt Co-authored-by: David Markowitz <39972741+EmosewaMC@users.noreply.github.com> --- dNet/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dNet/CMakeLists.txt b/dNet/CMakeLists.txt index 32b350d2..9881bb97 100644 --- a/dNet/CMakeLists.txt +++ b/dNet/CMakeLists.txt @@ -5,8 +5,7 @@ set(DNET_SOURCES "AuthPackets.cpp" "MasterPackets.cpp" "PacketUtils.cpp" "WorldPackets.cpp" - "ZoneInstanceManager.cpp" -) +"ZoneInstanceManager.cpp") add_library(dNet STATIC ${DNET_SOURCES}) target_link_libraries(dNet PRIVATE bcrypt MD5) From ca38139ff5096b9c1ae3edaa4439b974d0d23287 Mon Sep 17 00:00:00 2001 From: David Markowitz <39972741+EmosewaMC@users.noreply.github.com> Date: Thu, 2 Jan 2025 20:21:41 -0800 Subject: [PATCH 3/4] Update dNet/CMakeLists.txt --- dNet/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dNet/CMakeLists.txt b/dNet/CMakeLists.txt index 9881bb97..172aee20 100644 --- a/dNet/CMakeLists.txt +++ b/dNet/CMakeLists.txt @@ -5,7 +5,7 @@ set(DNET_SOURCES "AuthPackets.cpp" "MasterPackets.cpp" "PacketUtils.cpp" "WorldPackets.cpp" -"ZoneInstanceManager.cpp") + "ZoneInstanceManager.cpp") add_library(dNet STATIC ${DNET_SOURCES}) target_link_libraries(dNet PRIVATE bcrypt MD5) From deddf0f256ff26495ec9389587ab4300eb43bef3 Mon Sep 17 00:00:00 2001 From: Aaron Kimbre Date: Thu, 2 Jan 2025 22:23:40 -0600 Subject: [PATCH 4/4] move to top --- dCommon/GeneralUtils.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dCommon/GeneralUtils.cpp b/dCommon/GeneralUtils.cpp index 03b6a0bc..7cc9278b 100644 --- a/dCommon/GeneralUtils.cpp +++ b/dCommon/GeneralUtils.cpp @@ -7,6 +7,10 @@ #include #include +#include "json.hpp" + +using json = nlohmann::json; + template static inline size_t MinSize(const size_t size, const std::basic_string_view string) { if (size == SIZE_MAX || size > string.size()) { @@ -327,10 +331,6 @@ std::vector GeneralUtils::GetSqlFileNamesFromFolder(const std::stri return sortedFiles; } -#include "json.hpp" - -using json = nlohmann::json; - template<> [[nodiscard]] std::optional GeneralUtils::TryParse(std::string_view str) { try {