From 053a2540f33fc4e709b0f419f6636c423cf70252 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 1 Dec 2017 21:46:48 +0100 Subject: [PATCH] Fix building with HTTP disabled, but network enabled --- .../network/NetworkServerAdvertiser.cpp | 22 +++++++++++++++++-- .../network/NetworkServerAdvertiser.h | 2 +- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/openrct2/network/NetworkServerAdvertiser.cpp b/src/openrct2/network/NetworkServerAdvertiser.cpp index 93f4e45c79..26547f3fc3 100644 --- a/src/openrct2/network/NetworkServerAdvertiser.cpp +++ b/src/openrct2/network/NetworkServerAdvertiser.cpp @@ -33,6 +33,8 @@ #include "../world/park.h" #include "http.h" +#ifndef DISABLE_HTTP + enum MASTER_SERVER_STATUS { MASTER_SERVER_STATUS_OK = 200, @@ -44,7 +46,7 @@ enum MASTER_SERVER_STATUS constexpr sint32 MASTER_SERVER_REGISTER_TIME = 120 * 1000; // 2 minutes constexpr sint32 MASTER_SERVER_HEARTBEAT_TIME = 60 * 1000; // 1 minute -class NetworkServerAdvertiser : public INetworkServerAdvertiser +class NetworkServerAdvertiser final : public INetworkServerAdvertiser { private: uint16 _port; @@ -66,7 +68,7 @@ public: _key = GenerateAdvertiseKey(); } - ADVERTISE_STATUS GetStatus() override + ADVERTISE_STATUS GetStatus() const override { return _status; } @@ -255,4 +257,20 @@ INetworkServerAdvertiser * CreateServerAdvertiser(uint16 port) return new NetworkServerAdvertiser(port); } +#else // DISABLE_HTTP + +class DummyNetworkServerAdvertiser final : public INetworkServerAdvertiser +{ +public: + virtual ADVERTISE_STATUS GetStatus() const override { return ADVERTISE_STATUS_DISABLED; }; + virtual void Update() override {}; +}; + +INetworkServerAdvertiser * CreateServerAdvertiser(uint16 port) +{ + return new DummyNetworkServerAdvertiser(); +} + +#endif // DISABLE_HTTP + #endif // DISABLE_NETWORK diff --git a/src/openrct2/network/NetworkServerAdvertiser.h b/src/openrct2/network/NetworkServerAdvertiser.h index 9edda6c876..09b7b64c04 100644 --- a/src/openrct2/network/NetworkServerAdvertiser.h +++ b/src/openrct2/network/NetworkServerAdvertiser.h @@ -31,7 +31,7 @@ interface INetworkServerAdvertiser { virtual ~INetworkServerAdvertiser() { } - virtual ADVERTISE_STATUS GetStatus() abstract; + virtual ADVERTISE_STATUS GetStatus() const abstract; virtual void Update() abstract; };