mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 05:53:02 +01:00
Code Issues Releases Wiki Activity

Close #12426: Refactor NETWORK_READPACKET to use strong enum (#12807)

Browse Source 
Replacing enum NETWORK_READPACKET with enum class NetworkReadPacket.
This commit is contained in:
Julia Pinheiro
2020-08-31 09:13:15 -03:00
committed by GitHub
parent e9803fc4b5
commit dafde532af
7 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/openrct2/network/NetworkConnection.cpp
View File

@@ -30,7 +30,7 @@ NetworkConnection::~NetworkConnection()
delete[] _lastDisconnectReason;
}
int32_t NetworkConnection::ReadPacket()
NetworkReadPacket NetworkConnection::ReadPacket()
{
size_t bytesRead = 0;
@@ -42,8 +42,8 @@ int32_t NetworkConnection::ReadPacket()
uint8_t* buffer = reinterpret_cast<uint8_t*>(&InboundPacket.Header);
NETWORK_READPACKET status = Socket->ReceiveData(buffer, missingLength, &bytesRead);
if (status != NETWORK_READPACKET_SUCCESS)
NetworkReadPacket status = Socket->ReceiveData(buffer, missingLength, &bytesRead);
if (status != NetworkReadPacket::Success)
{
return status;
}
@@ -52,7 +52,7 @@ int32_t NetworkConnection::ReadPacket()
if (InboundPacket.BytesTransferred < sizeof(InboundPacket.Header))
{
// If still not enough data for header, keep waiting.
return NETWORK_READPACKET_MORE_DATA;
return NetworkReadPacket::MoreData;
}
// Normalise values.
@@ -74,8 +74,8 @@ int32_t NetworkConnection::ReadPacket()
if (missingLength > 0)
{
NETWORK_READPACKET status = Socket->ReceiveData(buffer, std::min(missingLength, NetworkBufferSize), &bytesRead);
if (status != NETWORK_READPACKET_SUCCESS)
NetworkReadPacket status = Socket->ReceiveData(buffer, std::min(missingLength, NetworkBufferSize), &bytesRead);
if (status != NetworkReadPacket::Success)
{
return status;
}
@@ -91,11 +91,11 @@ int32_t NetworkConnection::ReadPacket()
RecordPacketStats(InboundPacket, false);
return NETWORK_READPACKET_SUCCESS;
return NetworkReadPacket::Success;
}
}
return NETWORK_READPACKET_MORE_DATA;
return NetworkReadPacket::MoreData;
}
bool NetworkConnection::SendPacket(NetworkPacket& packet)