games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-28 23:06:24 +02:00
Code Issues Releases Activity

Minor cleanup - move reinterpret_cast to jsonNode

Browse Source
This commit is contained in:
Ivan Savenko 2023-12-29 00:31:53 +02:00
parent 55b504792e
commit 461bca73f3
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/globalLobby/GlobalLobbyClient.cpp
View File

@ -57,9 +57,7 @@ void GlobalLobbyClient::onPacketReceived(const std::shared_ptr<NetworkConnection
{
boost::mutex::scoped_lock interfaceLock(GH.interfaceMutex);
// FIXME: find better approach
const char * payloadBegin = reinterpret_cast<const char*>(message.data());
JsonNode json(payloadBegin, message.size());
JsonNode json(message.data(), message.size());
if (json["type"].String() == "authentication")
{

4
lib/JsonNode.cpp
View File

@ -72,6 +72,10 @@ JsonNode::JsonNode(JsonType Type)
setType(Type);
}
JsonNode::JsonNode(const uint8_t *data, size_t datasize)
:JsonNode(reinterpret_cast<const char*>(data), datasize)
{}
JsonNode::JsonNode(const char *data, size_t datasize)
{
JsonParser parser(data, datasize);

1
lib/JsonNode.h
View File

@ -51,6 +51,7 @@ public:
JsonNode(JsonType Type = JsonType::DATA_NULL);
//Create tree from Json-formatted input
explicit JsonNode(const char * data, size_t datasize);
explicit JsonNode(const uint8_t * data, size_t datasize);
//Create tree from JSON file
explicit JsonNode(const JsonPath & fileURI);
explicit JsonNode(const std::string & modName, const JsonPath & fileURI);

3
lobby/LobbyServer.cpp
View File

@ -129,8 +129,7 @@ void LobbyServer::onDisconnected(const std::shared_ptr<NetworkConnection> & conn
void LobbyServer::onPacketReceived(const std::shared_ptr<NetworkConnection> & connection, const std::vector<uint8_t> & message)
{
// FIXME: find better approach
const char * payloadBegin = reinterpret_cast<const char*>(message.data());
JsonNode json(payloadBegin, message.size());
JsonNode json(message.data(), message.size());
if (json["type"].String() == "sendChatMessage")
return receiveSendChatMessage(connection, json);