diff --git a/src/network/NetworkAction.cpp b/src/network/NetworkAction.cpp index a387d247c0..c4008d7725 100644 --- a/src/network/NetworkAction.cpp +++ b/src/network/NetworkAction.cpp @@ -14,6 +14,8 @@ *****************************************************************************/ #pragma endregion +#ifndef DISABLE_NETWORK + #include #include "NetworkAction.h" @@ -218,3 +220,5 @@ const std::vector NetworkActions::Actions = } }, }; + +#endif diff --git a/src/network/NetworkAddress.cpp b/src/network/NetworkAddress.cpp index 86bc25f3d4..c050ebc266 100644 --- a/src/network/NetworkAddress.cpp +++ b/src/network/NetworkAddress.cpp @@ -14,6 +14,8 @@ *****************************************************************************/ #pragma endregion +#ifndef DISABLE_NETWORK + #include #include #include "NetworkAddress.h" @@ -121,3 +123,5 @@ void NetworkAddress::ResolveWorker(ResolveRequest * req) } delete req; } + +#endif diff --git a/src/network/NetworkConnection.cpp b/src/network/NetworkConnection.cpp index 051c1d245c..27aaaee400 100644 --- a/src/network/NetworkConnection.cpp +++ b/src/network/NetworkConnection.cpp @@ -14,6 +14,8 @@ *****************************************************************************/ #pragma endregion +#ifndef DISABLE_NETWORK + #include "NetworkConnection.h" #include "../core/String.hpp" #include @@ -215,3 +217,5 @@ void NetworkConnection::SetLastDisconnectReason(const rct_string_id string_id, v format_string(buffer, string_id, args); SetLastDisconnectReason(buffer); } + +#endif diff --git a/src/network/NetworkGroup.cpp b/src/network/NetworkGroup.cpp index 4f273e589c..a4e27ab6ae 100644 --- a/src/network/NetworkGroup.cpp +++ b/src/network/NetworkGroup.cpp @@ -14,6 +14,8 @@ *****************************************************************************/ #pragma endregion +#ifndef DISABLE_NETWORK + #include "NetworkTypes.h" #include "NetworkAction.h" #include "NetworkGroup.h" @@ -136,3 +138,5 @@ bool NetworkGroup::CanPerformCommand(int command) const } return false; } + +#endif diff --git a/src/network/NetworkPacket.cpp b/src/network/NetworkPacket.cpp index 52645e5b0a..b22219e180 100644 --- a/src/network/NetworkPacket.cpp +++ b/src/network/NetworkPacket.cpp @@ -14,6 +14,8 @@ *****************************************************************************/ #pragma endregion +#ifndef DISABLE_NETWORK + #include "NetworkTypes.h" #include "NetworkPacket.h" @@ -112,3 +114,5 @@ const utf8 * NetworkPacket::ReadString() read++; return str; } + +#endif diff --git a/src/network/NetworkPlayer.cpp b/src/network/NetworkPlayer.cpp index 9674e8c0d5..677afcc21d 100644 --- a/src/network/NetworkPlayer.cpp +++ b/src/network/NetworkPlayer.cpp @@ -14,6 +14,8 @@ *****************************************************************************/ #pragma endregion +#ifndef DISABLE_NETWORK + #include "NetworkPacket.h" #include "NetworkPlayer.h" @@ -49,3 +51,5 @@ void NetworkPlayer::AddMoneySpent(money32 cost) commands_ran++; window_invalidate_by_number(WC_PLAYER, id); } + +#endif diff --git a/src/network/NetworkTypes.h b/src/network/NetworkTypes.h index 066fcd03f1..1f1db18354 100644 --- a/src/network/NetworkTypes.h +++ b/src/network/NetworkTypes.h @@ -19,6 +19,7 @@ #include #include +#ifndef DISABLE_NETWORK #ifdef __WINDOWS__ // winsock2 must be included before windows.h #include @@ -55,6 +56,7 @@ #endif // __WINDOWS__ #include "../common.h" +#endif enum NETWORK_READPACKET { diff --git a/src/network/NetworkUser.cpp b/src/network/NetworkUser.cpp index 28ce006b76..747a3acaff 100644 --- a/src/network/NetworkUser.cpp +++ b/src/network/NetworkUser.cpp @@ -14,6 +14,8 @@ *****************************************************************************/ #pragma endregion +#ifndef DISABLE_NETWORK + #include #include "../core/Json.hpp" @@ -241,3 +243,5 @@ void NetworkUserManager::GetStorePath(utf8 * buffer, size_t bufferSize) platform_get_user_directory(buffer, nullptr); Path::Append(buffer, bufferSize, USER_STORE_FILENAME); } + +#endif diff --git a/src/network/network.h b/src/network/network.h index 0b01b9f69f..cc80ddb0f8 100644 --- a/src/network/network.h +++ b/src/network/network.h @@ -48,6 +48,8 @@ extern "C" { } #endif // __cplusplus +#include "NetworkTypes.h" + #ifndef DISABLE_NETWORK // This define specifies which version of network stream current build uses. @@ -56,8 +58,6 @@ extern "C" { #define NETWORK_STREAM_VERSION "9" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION -#include "NetworkTypes.h" - // Fixes issues on OS X #if defined(_RCT2_H_) && !defined(_MSC_VER) // use similar struct packing as MSVC for our structs