diff --git a/Source/Engine/Networking/NetworkConfig.h b/Source/Engine/Networking/NetworkConfig.h index 8186aeae9..7752de3f6 100644 --- a/Source/Engine/Networking/NetworkConfig.h +++ b/Source/Engine/Networking/NetworkConfig.h @@ -6,23 +6,6 @@ class ScriptingObject; -/// -/// Network driver implementations enum. -/// [Deprecated in v1.3] -/// -API_ENUM(Namespace="FlaxEngine.Networking") enum class DEPRECATED() NetworkDriverType -{ - /// - /// Invalid network driver implementation. - /// - Undefined = 0, - - /// - /// ENet library based network driver implementation. - /// - ENet -}; - /// /// Low-level network configuration structure. Provides settings for the network driver and all internal components. /// @@ -30,14 +13,6 @@ API_STRUCT(Namespace="FlaxEngine.Networking") struct FLAXENGINE_API NetworkConfi { DECLARE_SCRIPTING_TYPE_MINIMAL(NetworkConfig); - /// - /// The network driver that will be used to create the peer. - /// To allow two peers to connect, they must use the same host. - /// [Deprecated in v1.3] - /// - API_FIELD() - DEPRECATED("Use NetworkDriver field instead") NetworkDriverType NetworkDriverType; - /// /// The network driver instance (implements INetworkDriver) that will be used to create and manage the peer, send and receive messages. /// @@ -81,15 +56,4 @@ API_STRUCT(Namespace="FlaxEngine.Networking") struct FLAXENGINE_API NetworkConfi /// API_FIELD() uint16 MessagePoolSize = 2048; - - // Ignore deprecation warnings in defaults - PRAGMA_DISABLE_DEPRECATION_WARNINGS - NetworkConfig() - { - NetworkDriverType = NetworkDriverType::ENet; - } - NetworkConfig(const NetworkConfig& other) = default; - NetworkConfig(NetworkConfig&& other) = default; - NetworkConfig& operator=(const NetworkConfig& other) = default; - PRAGMA_ENABLE_DEPRECATION_WARNINGS }; diff --git a/Source/Engine/Networking/NetworkPeer.cpp b/Source/Engine/Networking/NetworkPeer.cpp index 073d3d060..7491691a4 100644 --- a/Source/Engine/Networking/NetworkPeer.cpp +++ b/Source/Engine/Networking/NetworkPeer.cpp @@ -22,10 +22,6 @@ bool NetworkPeer::Initialize(const NetworkConfig& config) return true; Config = config; - PRAGMA_DISABLE_DEPRECATION_WARNINGS - if (Config.NetworkDriver == nullptr && Config.NetworkDriverType == NetworkDriverType::ENet) - Config.NetworkDriver = New(); - PRAGMA_ENABLE_DEPRECATION_WARNINGS if (Config.NetworkDriver == nullptr) {