ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Deduplicate NetPlayServer::Send() and NetPlayClient::Send() into ENetUtil::SendPacket().

This commit is contained in:
Admiral H. Curtiss 2022-10-09 02:25:28 +02:00
parent 5f3e8e0f05
commit 66684a392f
No known key found for this signature in database
GPG Key ID: F051B4C4044F33FB
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Common/ENetUtil.cpp
View File

@ -35,4 +35,11 @@ int ENET_CALLBACK InterceptCallback(ENetHost* host, ENetEvent* event)
} }
return 0; return 0;
} }
void SendPacket(ENetPeer* socket, const sf::Packet& packet, u8 channel_id)
{
ENetPacket* epac =
enet_packet_create(packet.getData(), packet.getDataSize(), ENET_PACKET_FLAG_RELIABLE);
enet_peer_send(socket, channel_id, epac);
}
} // namespace ENetUtil } // namespace ENetUtil

5
Source/Core/Common/ENetUtil.h
View File

@ -5,8 +5,13 @@
#include <enet/enet.h> #include <enet/enet.h>
#include <SFML/Network/Packet.hpp>
#include "Common/CommonTypes.h"
namespace ENetUtil namespace ENetUtil
{ {
void WakeupThread(ENetHost* host); void WakeupThread(ENetHost* host);
int ENET_CALLBACK InterceptCallback(ENetHost* host, ENetEvent* event); int ENET_CALLBACK InterceptCallback(ENetHost* host, ENetEvent* event);
void SendPacket(ENetPeer* socket, const sf::Packet& packet, u8 channel_id);
} // namespace ENetUtil } // namespace ENetUtil

4
Source/Core/Core/NetPlayClient.cpp
View File

@ -1465,9 +1465,7 @@ void NetPlayClient::OnGameDigestAbort()
void NetPlayClient::Send(const sf::Packet& packet, const u8 channel_id) void NetPlayClient::Send(const sf::Packet& packet, const u8 channel_id)
{ {
ENetPacket* epac = ENetUtil::SendPacket(m_server, packet, channel_id);
enet_packet_create(packet.getData(), packet.getDataSize(), ENET_PACKET_FLAG_RELIABLE);
enet_peer_send(m_server, channel_id, epac);
} }
void NetPlayClient::DisplayPlayersPing() void NetPlayClient::DisplayPlayersPing()

4
Source/Core/Core/NetPlayServer.cpp
View File

@ -2008,9 +2008,7 @@ void NetPlayServer::SendToClients(const sf::Packet& packet, const PlayerId skip_
void NetPlayServer::Send(ENetPeer* socket, const sf::Packet& packet, const u8 channel_id) void NetPlayServer::Send(ENetPeer* socket, const sf::Packet& packet, const u8 channel_id)
{ {
ENetPacket* epac = ENetUtil::SendPacket(socket, packet, channel_id);
enet_packet_create(packet.getData(), packet.getDataSize(), ENET_PACKET_FLAG_RELIABLE);
enet_peer_send(socket, channel_id, epac);
} }
void NetPlayServer::KickPlayer(PlayerId player) void NetPlayServer::KickPlayer(PlayerId player)