From 3ac3790ee744544e44b83bba3e13aa0b8c895924 Mon Sep 17 00:00:00 2001 From: vis2k Date: Mon, 11 Jun 2018 16:29:49 +0200 Subject: [PATCH] Removed all [Obsolete] code --- .../Runtime/NetworkClient.cs | 7 ------- .../Runtime/NetworkConnection.cs | 6 ------ .../Runtime/NetworkManager.cs | 3 --- .../Runtime/NetworkServer.cs | 17 ----------------- 4 files changed, 33 deletions(-) diff --git a/Unity-Technologies-networking/Runtime/NetworkClient.cs b/Unity-Technologies-networking/Runtime/NetworkClient.cs index 00a45fb06..0c4188cdc 100644 --- a/Unity-Technologies-networking/Runtime/NetworkClient.cs +++ b/Unity-Technologies-networking/Runtime/NetworkClient.cs @@ -65,13 +65,6 @@ internal void SetHandlers(NetworkConnection conn) public int serverPort { get { return m_ServerPort; } } public NetworkConnection connection { get { return m_Connection; } } -#if ENABLE_UNET_HOST_MIGRATION - [Obsolete("Moved to NetworkMigrationManager.")] -#else - [Obsolete("Removed")] -#endif - public PeerInfoMessage[] peers { get { return null; } } - internal int hostId { get { return m_ClientId; } } public Dictionary handlers { get { return m_MessageHandlers.GetHandlers(); } } public int numChannels { get { return m_HostTopology.DefaultConfig.ChannelCount; } } diff --git a/Unity-Technologies-networking/Runtime/NetworkConnection.cs b/Unity-Technologies-networking/Runtime/NetworkConnection.cs index 51dd00949..319e174ff 100644 --- a/Unity-Technologies-networking/Runtime/NetworkConnection.cs +++ b/Unity-Technologies-networking/Runtime/NetworkConnection.cs @@ -569,12 +569,6 @@ public virtual void TransportReceive(byte[] bytes, int numBytes, int channelId) HandleBytes(bytes, numBytes, channelId); } - [Obsolete("TransportRecieve has been deprecated. Use TransportReceive instead (UnityUpgradable) -> TransportReceive(*)", false)] - public virtual void TransportRecieve(byte[] bytes, int numBytes, int channelId) - { - TransportReceive(bytes, numBytes, channelId); - } - public virtual bool TransportSend(byte[] bytes, int numBytes, int channelId, out byte error) { return NetworkTransport.Send(hostId, connectionId, channelId, bytes, numBytes, out error); diff --git a/Unity-Technologies-networking/Runtime/NetworkManager.cs b/Unity-Technologies-networking/Runtime/NetworkManager.cs index ce04f7889..c0c6ee2ea 100644 --- a/Unity-Technologies-networking/Runtime/NetworkManager.cs +++ b/Unity-Technologies-networking/Runtime/NetworkManager.cs @@ -73,9 +73,6 @@ public class NetworkManager : MonoBehaviour public bool runInBackground { get { return m_RunInBackground; } set { m_RunInBackground = value; } } public bool scriptCRCCheck { get { return m_ScriptCRCCheck; } set { m_ScriptCRCCheck = value; }} - [Obsolete("moved to NetworkMigrationManager")] - public bool sendPeerInfo { get { return false; } set {} } - public float maxDelay { get { return m_MaxDelay; } set { m_MaxDelay = value; } } public LogFilter.FilterLevel logLevel { get { return m_LogLevel; } set { m_LogLevel = value; LogFilter.currentLogLevel = value; } } public GameObject playerPrefab { get { return m_PlayerPrefab; } set { m_PlayerPrefab = value; } } diff --git a/Unity-Technologies-networking/Runtime/NetworkServer.cs b/Unity-Technologies-networking/Runtime/NetworkServer.cs index 7a7aae510..a1d128a6c 100644 --- a/Unity-Technologies-networking/Runtime/NetworkServer.cs +++ b/Unity-Technologies-networking/Runtime/NetworkServer.cs @@ -41,14 +41,6 @@ public sealed class NetworkServer static public HostTopology hostTopology { get { return instance.m_SimpleServerSimple.hostTopology; }} public static Dictionary objects { get { return instance.m_NetworkScene.localObjects; } } -#if ENABLE_UNET_HOST_MIGRATION - [Obsolete("Moved to NetworkMigrationManager")] - public static bool sendPeerInfo { get { return false; } set {} } -#else - [Obsolete("Removed")] - public static bool sendPeerInfo { get { return false; } set {} } -#endif - public static bool dontListen { get { return m_DontListen; } set { m_DontListen = value; } } public static bool useWebSockets { get { return instance.m_SimpleServerSimple.useWebSockets; } set { instance.m_SimpleServerSimple.useWebSockets = value; } } @@ -1747,15 +1739,6 @@ static void SendCrc(NetworkConnection targetConnection) targetConnection.Send(MsgType.CRC, crcMsg); } -#if ENABLE_UNET_HOST_MIGRATION - [Obsolete("moved to NetworkMigrationManager")] -#else - [Obsolete("Removed")] -#endif - public void SendNetworkInfo(NetworkConnection targetConnection) - { - } - class ServerSimpleWrapper : NetworkServerSimple { NetworkServer m_Server;