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

Fix building with HTTP disabled, but network enabled

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

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

@@ -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

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

@@ -31,7 +31,7 @@ interface INetworkServerAdvertiser
{
virtual ~INetworkServerAdvertiser() { }
virtual ADVERTISE_STATUS GetStatus() abstract;
virtual ADVERTISE_STATUS GetStatus() const abstract;
virtual void Update() abstract;
};