From 80b4a4d7fdf09627a74ab244ccb564cb948ae884 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 22 Sep 2021 15:10:31 -0400 Subject: [PATCH] NetPlayProto: Remove now-unused MessageId type alias Now that we have enum helpers for inserting values into packets and have migrated all other enumerations over, there's no need to keep this alias around any longer. --- Source/Core/Core/NetPlayProto.h | 3 ++- Source/Core/Core/NetPlayServer.cpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/NetPlayProto.h b/Source/Core/Core/NetPlayProto.h index 4a2e4d263c..4d3cf436fb 100644 --- a/Source/Core/Core/NetPlayProto.h +++ b/Source/Core/Core/NetPlayProto.h @@ -122,6 +122,8 @@ struct NetTraversalConfig enum class MessageID : u8 { + ConnectionSuccessful = 0, + PlayerJoin = 0x10, PlayerLeave = 0x11, @@ -225,7 +227,6 @@ struct WiimoteInput u8 report_id; std::vector data; }; -using MessageId = u8; using PlayerId = u8; using FrameNum = u32; using PadIndex = s8; diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp index f75daf2208..c125cef358 100644 --- a/Source/Core/Core/NetPlayServer.cpp +++ b/Source/Core/Core/NetPlayServer.cpp @@ -431,9 +431,9 @@ ConnectionError NetPlayServer::OnConnect(ENetPeer* socket, sf::Packet& rpac) spac << player.pid << player.name << player.revision; SendToClients(spac); - // send new client success message with their id + // send new client success message with their ID spac.clear(); - spac << static_cast(0); + spac << MessageID::ConnectionSuccessful; spac << player.pid; Send(player.socket, spac);