mirrors/dolphin-emulator
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-25 06:44:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactored parameter to OnConnect() in NetPlayServer.cpp from rpac to received_packet

Browse source
This commit is contained in:
Sage King 2022-08-04 09:26:21 -06:00
parent 9d14d95737
commit d81756e9b9
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Source/Core/Core/NetPlayServer.cpp
View file

@ -379,7 +379,7 @@ static void SendSyncIdentifier(sf::Packet& spac, const SyncIdentifier& sync_iden
} }
// called from ---NETPLAY--- thread // called from ---NETPLAY--- thread
ConnectionError NetPlayServer::OnConnect(ENetPeer* socket, sf::Packet& rpac) ConnectionError NetPlayServer::OnConnect(ENetPeer* socket, sf::Packet& received_packet)
{ {
PlayerId pid = 1; PlayerId pid = 1;
for (auto i = m_players.begin(); i != m_players.end(); ++i) for (auto i = m_players.begin(); i != m_players.end(); ++i)
@ -393,7 +393,7 @@ ConnectionError NetPlayServer::OnConnect(ENetPeer* socket, sf::Packet& rpac)
socket->data = new PlayerId(pid); socket->data = new PlayerId(pid);
std::string netplay_version; std::string netplay_version;
rpac >> netplay_version; received_packet >> netplay_version;
if (netplay_version != Common::GetScmRevGitStr()) if (netplay_version != Common::GetScmRevGitStr())
return ConnectionError::VersionMismatch; return ConnectionError::VersionMismatch;
@ -407,8 +407,8 @@ ConnectionError NetPlayServer::OnConnect(ENetPeer* socket, sf::Packet& rpac)
player.pid = pid; player.pid = pid;
player.socket = socket; player.socket = socket;
rpac >> player.revision; received_packet >> player.revision;
rpac >> player.name; received_packet >> player.name;
if (StringUTF8CodePointCount(player.name) > MAX_NAME_LENGTH) if (StringUTF8CodePointCount(player.name) > MAX_NAME_LENGTH)
return ConnectionError::NameTooLong; return ConnectionError::NameTooLong;

2
Source/Core/Core/NetPlayServer.h
View file

@ -129,7 +129,7 @@ private:
void SendToClients(const sf::Packet& packet, PlayerId skip_pid = 0, void SendToClients(const sf::Packet& packet, PlayerId skip_pid = 0,
u8 channel_id = DEFAULT_CHANNEL); u8 channel_id = DEFAULT_CHANNEL);
void Send(ENetPeer* socket, const sf::Packet& packet, u8 channel_id = DEFAULT_CHANNEL); void Send(ENetPeer* socket, const sf::Packet& packet, u8 channel_id = DEFAULT_CHANNEL);
ConnectionError OnConnect(ENetPeer* socket, sf::Packet& rpac); ConnectionError OnConnect(ENetPeer* socket, sf::Packet& received_packet);
unsigned int OnDisconnect(const Client& player); unsigned int OnDisconnect(const Client& player);
unsigned int OnData(sf::Packet& packet, Client& player); unsigned int OnData(sf::Packet& packet, Client& player);