diff --git a/src/openrct2/network/NetworkServerAdvertiser.cpp b/src/openrct2/network/NetworkServerAdvertiser.cpp index 26547f3fc3..8b990416a3 100644 --- a/src/openrct2/network/NetworkServerAdvertiser.cpp +++ b/src/openrct2/network/NetworkServerAdvertiser.cpp @@ -51,7 +51,7 @@ class NetworkServerAdvertiser final : public INetworkServerAdvertiser private: uint16 _port; - ADVERTISE_STATUS _status = ADVERTISE_STATUS_UNREGISTERED; + ADVERTISE_STATUS _status = ADVERTISE_STATUS::ADVERTISE_STATUS_UNREGISTERED; uint32 _lastAdvertiseTime = 0; uint32 _lastHeartbeatTime = 0; @@ -76,20 +76,20 @@ public: void Update() override { switch (_status) { - case ADVERTISE_STATUS_UNREGISTERED: + case ADVERTISE_STATUS::ADVERTISE_STATUS_UNREGISTERED: if (_lastAdvertiseTime == 0 || platform_get_ticks() > _lastAdvertiseTime + MASTER_SERVER_REGISTER_TIME) { SendRegistration(); } break; - case ADVERTISE_STATUS_REGISTERED: + case ADVERTISE_STATUS::ADVERTISE_STATUS_REGISTERED: if (platform_get_ticks() > _lastHeartbeatTime + MASTER_SERVER_HEARTBEAT_TIME) { SendHeartbeat(); } break; // exhaust enum values to satisfy clang - case ADVERTISE_STATUS_DISABLED: + case ADVERTISE_STATUS::ADVERTISE_STATUS_DISABLED: break; } } @@ -169,7 +169,7 @@ private: if (json_is_string(jsonToken)) { _token = std::string(json_string_value(jsonToken)); - _status = ADVERTISE_STATUS_REGISTERED; + _status = ADVERTISE_STATUS::ADVERTISE_STATUS_REGISTERED; } } else @@ -197,7 +197,7 @@ private: } 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"); } } @@ -262,7 +262,7 @@ INetworkServerAdvertiser * CreateServerAdvertiser(uint16 port) class DummyNetworkServerAdvertiser final : public INetworkServerAdvertiser { 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 {}; }; diff --git a/src/openrct2/network/NetworkServerAdvertiser.h b/src/openrct2/network/NetworkServerAdvertiser.h index 09b7b64c04..3a1c79f6e9 100644 --- a/src/openrct2/network/NetworkServerAdvertiser.h +++ b/src/openrct2/network/NetworkServerAdvertiser.h @@ -20,7 +20,7 @@ #include "../common.h" -enum ADVERTISE_STATUS +enum class ADVERTISE_STATUS { ADVERTISE_STATUS_DISABLED, ADVERTISE_STATUS_UNREGISTERED,