Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-28 08:27:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

address feedback

Browse Source
This commit is contained in:
Aaron Kimbre 2024-04-26 06:17:54 -05:00
parent ce5bd68067
commit 214626222c
4 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dChatServer/ChatWebApi.cpp
View File

@ -10,7 +10,9 @@
#include "PlayerContainer.h" #include "PlayerContainer.h"
#include "dConfig.h" #include "dConfig.h"
#include "httplib.h" #include "httplib.h"
#include "json.h" #include "nlohmann/json.hpp"
using json = nlohmann::json;
namespace { namespace {
httplib::Server m_APIServer; httplib::Server m_APIServer;

2
dChatServer/PlayerContainer.cpp
View File

@ -15,6 +15,8 @@
#include "dConfig.h" #include "dConfig.h"
#include "eChatMessageType.h" #include "eChatMessageType.h"
using json = nlohmann::json;
const json PlayerData::to_json() const { const json PlayerData::to_json() const {
json data; json data;
data["id"] = this->playerID; data["id"] = this->playerID;

4
dChatServer/PlayerContainer.h
View File

@ -6,7 +6,7 @@
#include "Game.h" #include "Game.h"
#include "dServer.h" #include "dServer.h"
#include <unordered_map> #include <unordered_map>
#include "json.h" #include "nlohmann/json.hpp"
enum class eGameMasterLevel : uint8_t; enum class eGameMasterLevel : uint8_t;
@ -37,7 +37,7 @@ struct PlayerData {
return muteExpire == 1 || muteExpire > time(NULL); return muteExpire == 1 || muteExpire > time(NULL);
} }
const json to_json() const; const nlohmann::json to_json() const;
SystemAddress sysAddr{}; SystemAddress sysAddr{};
LWOZONEID zoneID{}; LWOZONEID zoneID{};

10
dCommon/json.h
View File

@ -1,10 +0,0 @@
#ifndef __JSON__H__
#define __JSON__H__
#include "nlohmann/json.hpp"
namespace {
using json = nlohmann::json;
}
#endif // !__JSON__H__