mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Close #12423: Refactor NETWORK_SERVER_STATE to use strong enum (#12802) 

#12423
This commit is contained in:
ju-pinheiro 2020-08-29 08:05:51 -03:00 committed by GitHub
parent 6e7927e4ed
commit e9c3f31422
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -782,16 +782,16 @@ bool NetworkBase::CheckSRAND(uint32_t tick, uint32_t srand0)
bool NetworkBase::IsDesynchronised()
{
return _serverState.state == NETWORK_SERVER_STATE_DESYNCED;
return _serverState.state == NetworkServerState::Desynced;
}
bool NetworkBase::CheckDesynchronizaton()
{
// Check synchronisation
if (GetMode() == NETWORK_MODE_CLIENT && _serverState.state != NETWORK_SERVER_STATE_DESYNCED
if (GetMode() == NETWORK_MODE_CLIENT && _serverState.state != NetworkServerState::Desynced
&& !CheckSRAND(gCurrentTicks, scenario_rand_state().s0))
{
_serverState.state = NETWORK_SERVER_STATE_DESYNCED;
_serverState.state = NetworkServerState::Desynced;
_serverState.desyncTick = gCurrentTicks;
char str_desync[256];
@ -2697,7 +2697,7 @@ void NetworkBase::Client_Handle_MAP([[maybe_unused]] NetworkConnection& connecti
game_load_scripts();
_serverState.tick = gCurrentTicks;
// window_network_status_open("Loaded new map from network");
_serverState.state = NETWORK_SERVER_STATE_OK;
_serverState.state = NetworkServerState::Ok;
_clientMapLoaded = true;
gFirstTimeSaving = true;

8
src/openrct2/network/NetworkTypes.h
View File

@ -88,15 +88,15 @@ enum class NetworkCommand : uint32_t
static_assert(NetworkCommand::GameInfo == static_cast<NetworkCommand>(9), "Master server expects this to be 9");
enum NETWORK_SERVER_STATE
enum class NetworkServerState
{
NETWORK_SERVER_STATE_OK,
NETWORK_SERVER_STATE_DESYNCED,
Ok,
Desynced
};
struct NetworkServerState_t
{
NETWORK_SERVER_STATE state = NETWORK_SERVER_STATE_OK;
NetworkServerState state = NetworkServerState::Ok;
uint32_t desyncTick = 0;
uint32_t tick = 0;
uint32_t srand0 = 0;