piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

TraversalClient: Convert state enum into an enum class

Browse Source 
Prevents implicit conversions and prevents identifiers from polluting
the class scope.
This commit is contained in:
Lioncash
2021-01-19 14:00:01 -05:00
parent ebf3b5faf4
commit 2021175809
5 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Common/TraversalClient.cpp
View File

@ -48,7 +48,7 @@ void TraversalClient::ReconnectToServer()
}
m_ServerAddress.port = m_port;
m_State = Connecting;
m_State = State::Connecting;
TraversalPacket hello = {};
hello.type = TraversalPacketHelloFromClient;
@ -145,7 +145,7 @@ void TraversalClient::HandleServerPacket(TraversalPacket* packet)
}
break;
case TraversalPacketHelloFromServer:
if (m_State != Connecting)
if (!IsConnecting())
break;
if (!packet->helloFromServer.ok)
{
@ -153,7 +153,7 @@ void TraversalClient::HandleServerPacket(TraversalPacket* packet)
break;
}
m_HostId = packet->helloFromServer.yourHostId;
m_State = Connected;
m_State = State::Connected;
if (m_Client)
m_Client->OnTraversalStateChanged();
break;
@ -214,7 +214,7 @@ void TraversalClient::HandleServerPacket(TraversalPacket* packet)
void TraversalClient::OnFailure(FailureReason reason)
{
m_State = Failure;
m_State = State::Failure;
m_FailureReason = reason;
if (m_Client)
@ -257,7 +257,7 @@ void TraversalClient::HandleResends()
void TraversalClient::HandlePing()
{
const u32 now = enet_time_get();
if (m_State == Connected && now - m_PingTime >= 500)
if (IsConnected() && now - m_PingTime >= 500)
{
TraversalPacket ping = {};
ping.type = TraversalPacketPing;

8
Source/Core/Common/TraversalClient.h
View File

@ -25,11 +25,11 @@ public:
class TraversalClient
{
public:
enum State
enum class State
{
Connecting,
Connected,
Failure
Failure,
};
enum class FailureReason
{
@ -46,6 +46,10 @@ public:
State GetState() const;
FailureReason GetFailureReason() const;
bool HasFailed() const { return m_State == State::Failure; }
bool IsConnecting() const { return m_State == State::Connecting; }
bool IsConnected() const { return m_State == State::Connected; }
void Reset();
void ConnectToClient(const std::string& host);
void ReconnectToServer();