mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 19:13:07 +01:00
Code Issues Releases Wiki Activity

Implement network.sendMessage(msg, players)

Browse Source
This commit is contained in:
Ted John
2020-04-28 22:02:14 +01:00
parent d0154d08e9
commit 297fe537b6
3 changed files with 48 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/openrct2/network/Network.cpp
View File

@@ -177,7 +177,7 @@ public:
void Server_Send_TOKEN(NetworkConnection& connection);
void Server_Send_MAP(NetworkConnection* connection = nullptr);
void Client_Send_CHAT(const char* text);
void Server_Send_CHAT(const char* text);
void Server_Send_CHAT(const char* text, const std::vector<uint8_t>& playerIds = {});
void Client_Send_GAME_ACTION(const GameAction* action);
void Server_Send_GAME_ACTION(const GameAction* action);
void Server_Send_TICK();
@@ -1671,12 +1671,27 @@ void Network::Client_Send_CHAT(const char* text)
_serverConnection->QueuePacket(std::move(packet));
}
void Network::Server_Send_CHAT(const char* text)
void Network::Server_Send_CHAT(const char* text, const std::vector<uint8_t>& playerIds)
{
std::unique_ptr<NetworkPacket> packet(NetworkPacket::Allocate());
*packet << static_cast<uint32_t>(NETWORK_COMMAND_CHAT);
packet->WriteString(text);
SendPacketToClients(*packet);
if (playerIds.empty())
{
SendPacketToClients(*packet);
}
else
{
for (auto playerId : playerIds)
{
auto conn = GetPlayerConnection(playerId);
if (conn != nullptr && !conn->IsDisconnected)
{
conn->QueuePacket(NetworkPacket::Duplicate(*packet));
}
}
}
}
void Network::Client_Send_GAME_ACTION(const GameAction* action)
@@ -3972,7 +3987,7 @@ void network_send_map()
gNetwork.Server_Send_MAP();
}
void network_send_chat(const char* text)
void network_send_chat(const char* text, const std::vector<uint8_t>& playerIds)
{
if (gNetwork.GetMode() == NETWORK_MODE_CLIENT)
{
@@ -3987,8 +4002,12 @@ void network_send_chat(const char* text)
if (player != nullptr)
{
auto formatted = gNetwork.FormatChat(player, message.c_str());
chat_history_add(formatted);
gNetwork.Server_Send_CHAT(formatted);
if (playerIds.empty()
|| std::find(playerIds.begin(), playerIds.end(), gNetwork.GetPlayerID()) != playerIds.end())
{
chat_history_add(formatted);
}
gNetwork.Server_Send_CHAT(formatted, playerIds);
}
}
}
@@ -4311,7 +4330,7 @@ int32_t network_get_pickup_peep_old_x(uint8_t playerid)
{
return _pickup_peep_old_x;
}
void network_send_chat(const char* text)
void network_send_chat(const char* text, const std::vector<uint8_t>& playerIds)
{
}
void network_send_password(const std::string& password)

3
src/openrct2/network/network.h
View File

@@ -20,6 +20,7 @@
#include <memory>
#include <string>
#include <vector>
struct json_t;
struct GameAction;
@@ -94,7 +95,7 @@ void network_set_pickup_peep_old_x(uint8_t playerid, int32_t x);
int32_t network_get_pickup_peep_old_x(uint8_t playerid);
void network_send_map();
void network_send_chat(const char* text);
void network_send_chat(const char* text, const std::vector<uint8_t>& playerIds = {});
void network_send_game_action(const GameAction* action);
void network_enqueue_game_action(const GameAction* action);
void network_send_password(const std::string& password);

21
src/openrct2/scripting/ScNetwork.hpp
View File

@@ -408,7 +408,26 @@ namespace OpenRCT2::Scripting
# ifndef DISABLE_NETWORK
if (players.is_array())
{
duk_error(players.context(), DUK_ERR_ERROR, "Not yet supported");
if (network_get_mode() == NETWORK_MODE_SERVER)
{
std::vector<uint8_t> playerIds;
auto playerArray = players.as_array();
for (const auto& item : playerArray)
{
if (item.type() == DukValue::Type::NUMBER)
{
playerIds.push_back(static_cast<uint8_t>(item.as_int()));
}
}
if (!playerArray.empty())
{
network_send_chat(message.c_str(), playerIds);
}
}
else
{
duk_error(players.context(), DUK_ERR_ERROR, "Only servers can send private messages.");
}
}
else
{