mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Close #12425: Refactor SOCKET_STATUS to use strong enum (#13064)

Browse Source
This commit is contained in:
Julia Pinheiro
2020-10-01 22:10:51 -03:00
committed by GitHub
parent 657106d4c6
commit c36ec5c5ce
6 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/openrct2/network/NetworkBase.cpp
View File

@@ -234,7 +234,7 @@ void NetworkBase::CloseConnection()
mode = NETWORK_MODE_NONE;
status = NETWORK_STATUS_NONE;
_lastConnectStatus = SOCKET_STATUS_CLOSED;
_lastConnectStatus = SocketStatus::Closed;
}
bool NetworkBase::BeginClient(const std::string& host, uint16_t port)
@@ -260,7 +260,7 @@ bool NetworkBase::BeginClient(const std::string& host, uint16_t port)
_serverState.gamestateSnapshotsEnabled = false;
status = NETWORK_STATUS_CONNECTING;
_lastConnectStatus = SOCKET_STATUS_CLOSED;
_lastConnectStatus = SocketStatus::Closed;
_clientMapLoaded = false;
_serverTickData.clear();
@@ -543,11 +543,11 @@ void NetworkBase::UpdateClient()
{
switch (_serverConnection->Socket->GetStatus())
{
case SOCKET_STATUS_RESOLVING:
case SocketStatus::Resolving:
{
if (_lastConnectStatus != SOCKET_STATUS_RESOLVING)
if (_lastConnectStatus != SocketStatus::Resolving)
{
_lastConnectStatus = SOCKET_STATUS_RESOLVING;
_lastConnectStatus = SocketStatus::Resolving;
char str_resolving[256];
format_string(str_resolving, 256, STR_MULTIPLAYER_RESOLVING, nullptr);
@@ -558,11 +558,11 @@ void NetworkBase::UpdateClient()
}
break;
}
case SOCKET_STATUS_CONNECTING:
case SocketStatus::Connecting:
{
if (_lastConnectStatus != SOCKET_STATUS_CONNECTING)
if (_lastConnectStatus != SocketStatus::Connecting)
{
_lastConnectStatus = SOCKET_STATUS_CONNECTING;
_lastConnectStatus = SocketStatus::Connecting;
char str_connecting[256];
format_string(str_connecting, 256, STR_MULTIPLAYER_CONNECTING, nullptr);
@@ -575,7 +575,7 @@ void NetworkBase::UpdateClient()
}
break;
}
case SOCKET_STATUS_CONNECTED:
case SocketStatus::Connected:
{
status = NETWORK_STATUS_CONNECTED;
_serverConnection->ResetLastPacketTime();