Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-01-21 20:27:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
David Markowitz 2025-01-02 20:25:02 -08:00
commit 915e9f75d1
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dCommon/GeneralUtils.cpp
View File

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

1
dCommon/GeneralUtils.h
View File

@ -18,7 +18,6 @@
#include "dPlatforms.h" #include "dPlatforms.h"
#include "Game.h" #include "Game.h"
#include "Logger.h" #include "Logger.h"
#include "json_fwd.hpp"
enum eInventoryType : uint32_t; enum eInventoryType : uint32_t;
enum class eObjectBits : size_t; enum class eObjectBits : size_t;

1
dCommon/Logger.h
View File

@ -80,7 +80,6 @@ public:
void SetLogToConsole(bool logToConsole); void SetLogToConsole(bool logToConsole);
void SetLogDebugStatements(bool logDebugStatements) { m_logDebugStatements = logDebugStatements; } void SetLogDebugStatements(bool logDebugStatements) { m_logDebugStatements = logDebugStatements; }
bool GetLogDebugStatements() const { return m_logDebugStatements; }
private: private:
void vLog(const char* format, va_list args); void vLog(const char* format, va_list args);

3
dNet/CMakeLists.txt
View File

@ -5,8 +5,7 @@ set(DNET_SOURCES "AuthPackets.cpp"
"MasterPackets.cpp" "MasterPackets.cpp"
"PacketUtils.cpp" "PacketUtils.cpp"
"WorldPackets.cpp" "WorldPackets.cpp"
"ZoneInstanceManager.cpp" "ZoneInstanceManager.cpp")
)
add_library(dNet STATIC ${DNET_SOURCES}) add_library(dNet STATIC ${DNET_SOURCES})
target_link_libraries(dNet PRIVATE bcrypt MD5) target_link_libraries(dNet PRIVATE bcrypt MD5)