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

Make ADVERTISE_STATUS enum class

Browse Source
This commit is contained in:
Michał Janiszewski
2017-12-01 21:55:50 +01:00
committed by Michał Janiszewski
parent 053a2540f3
commit 8e57c7d05d
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/openrct2/network/NetworkServerAdvertiser.cpp
View File

@@ -51,7 +51,7 @@ class NetworkServerAdvertiser final : public INetworkServerAdvertiser
private: private:
uint16 _port; uint16 _port;
ADVERTISE_STATUS _status = ADVERTISE_STATUS_UNREGISTERED; ADVERTISE_STATUS _status = ADVERTISE_STATUS::ADVERTISE_STATUS_UNREGISTERED;
uint32 _lastAdvertiseTime = 0; uint32 _lastAdvertiseTime = 0;
uint32 _lastHeartbeatTime = 0; uint32 _lastHeartbeatTime = 0;
@@ -76,20 +76,20 @@ public:
void Update() override void Update() override
{ {
switch (_status) { switch (_status) {
case ADVERTISE_STATUS_UNREGISTERED: case ADVERTISE_STATUS::ADVERTISE_STATUS_UNREGISTERED:
if (_lastAdvertiseTime == 0 || platform_get_ticks() > _lastAdvertiseTime + MASTER_SERVER_REGISTER_TIME) if (_lastAdvertiseTime == 0 || platform_get_ticks() > _lastAdvertiseTime + MASTER_SERVER_REGISTER_TIME)
{ {
SendRegistration(); SendRegistration();
} }
break; break;
case ADVERTISE_STATUS_REGISTERED: case ADVERTISE_STATUS::ADVERTISE_STATUS_REGISTERED:
if (platform_get_ticks() > _lastHeartbeatTime + MASTER_SERVER_HEARTBEAT_TIME) if (platform_get_ticks() > _lastHeartbeatTime + MASTER_SERVER_HEARTBEAT_TIME)
{ {
SendHeartbeat(); SendHeartbeat();
} }
break; break;
// exhaust enum values to satisfy clang // exhaust enum values to satisfy clang
case ADVERTISE_STATUS_DISABLED: case ADVERTISE_STATUS::ADVERTISE_STATUS_DISABLED:
break; break;
} }
} }
@@ -169,7 +169,7 @@ private:
if (json_is_string(jsonToken)) if (json_is_string(jsonToken))
{ {
_token = std::string(json_string_value(jsonToken)); _token = std::string(json_string_value(jsonToken));
_status = ADVERTISE_STATUS_REGISTERED; _status = ADVERTISE_STATUS::ADVERTISE_STATUS_REGISTERED;
} }
} }
else else
@@ -197,7 +197,7 @@ private:
} }
else if (status == MASTER_SERVER_STATUS_INVALID_TOKEN) else if (status == MASTER_SERVER_STATUS_INVALID_TOKEN)
{ {
_status = ADVERTISE_STATUS_UNREGISTERED; _status = ADVERTISE_STATUS::ADVERTISE_STATUS_UNREGISTERED;
Console::WriteLine("Master server heartbeat failed: Invalid Token"); Console::WriteLine("Master server heartbeat failed: Invalid Token");
} }
} }
@@ -262,7 +262,7 @@ INetworkServerAdvertiser * CreateServerAdvertiser(uint16 port)
class DummyNetworkServerAdvertiser final : public INetworkServerAdvertiser class DummyNetworkServerAdvertiser final : public INetworkServerAdvertiser
{ {
public: public:
virtual ADVERTISE_STATUS GetStatus() const override { return ADVERTISE_STATUS_DISABLED; }; virtual ADVERTISE_STATUS GetStatus() const override { return ADVERTISE_STATUS::ADVERTISE_STATUS_DISABLED; };
virtual void Update() override {}; virtual void Update() override {};
}; };

2
src/openrct2/network/NetworkServerAdvertiser.h
View File

@@ -20,7 +20,7 @@
#include "../common.h" #include "../common.h"
enum ADVERTISE_STATUS enum class ADVERTISE_STATUS
{ {
ADVERTISE_STATUS_DISABLED, ADVERTISE_STATUS_DISABLED,
ADVERTISE_STATUS_UNREGISTERED, ADVERTISE_STATUS_UNREGISTERED,