Merge branch 'webapiv2' of https://github.com/DarkflameUniverse/DarkflameServer into webapiv2

dCommon/GeneralUtils.cpp

@@ -7,6 +7,10 @@
 #include <filesystem>
 #include <map>
 
+#include "json.hpp"
+
+using json = nlohmann::json;
+
 template <typename T>
 static inline size_t MinSize(const size_t size, const std::basic_string_view<T> string) {
 	if (size == SIZE_MAX || size > string.size()) {
@@ -327,10 +331,6 @@ std::vector<std::string> GeneralUtils::GetSqlFileNamesFromFolder(const std::stri
 	return sortedFiles;
 }
 
-#include "json.hpp"
-
-using json = nlohmann::json;
-
 template<>
 [[nodiscard]] std::optional<json> GeneralUtils::TryParse(std::string_view str) {
 	try {

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;

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);

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)