diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp index 69759490d1..e7f2f080fa 100644 --- a/Source/Core/Core/NetPlayServer.cpp +++ b/Source/Core/Core/NetPlayServer.cpp @@ -379,7 +379,7 @@ static void SendSyncIdentifier(sf::Packet& spac, const SyncIdentifier& sync_iden } // called from ---NETPLAY--- thread -ConnectionError NetPlayServer::OnConnect(ENetPeer* socket, sf::Packet& rpac) +ConnectionError NetPlayServer::OnConnect(ENetPeer* socket, sf::Packet& received_packet) { PlayerId pid = 1; 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); std::string netplay_version; - rpac >> netplay_version; + received_packet >> netplay_version; if (netplay_version != Common::GetScmRevGitStr()) return ConnectionError::VersionMismatch; @@ -407,8 +407,8 @@ ConnectionError NetPlayServer::OnConnect(ENetPeer* socket, sf::Packet& rpac) player.pid = pid; player.socket = socket; - rpac >> player.revision; - rpac >> player.name; + received_packet >> player.revision; + received_packet >> player.name; if (StringUTF8CodePointCount(player.name) > MAX_NAME_LENGTH) return ConnectionError::NameTooLong; diff --git a/Source/Core/Core/NetPlayServer.h b/Source/Core/Core/NetPlayServer.h index 67de180204..77b1f7f357 100644 --- a/Source/Core/Core/NetPlayServer.h +++ b/Source/Core/Core/NetPlayServer.h @@ -129,7 +129,7 @@ private: void SendToClients(const sf::Packet& packet, PlayerId skip_pid = 0, 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 OnData(sf::Packet& packet, Client& player);