From 589a663d647c8b274bbc9213de34be334e48a20a Mon Sep 17 00:00:00 2001 From: Marco Hoffmann Date: Fri, 9 Jul 2021 00:51:22 +0200 Subject: [PATCH] Sync --- FizzySteamworks.cs | 4 +--- LegacyClient.cs | 6 ++---- LegacyCommon.cs | 6 ++---- LegacyServer.cs | 6 ++---- NextClient.cs | 4 +--- NextCommon.cs | 2 -- NextServer.cs | 4 +--- 7 files changed, 9 insertions(+), 23 deletions(-) diff --git a/FizzySteamworks.cs b/FizzySteamworks.cs index 1404757..d977e66 100644 --- a/FizzySteamworks.cs +++ b/FizzySteamworks.cs @@ -1,4 +1,3 @@ -#if !DISABLESTEAMWORKS using Steamworks; using System; using System.IO; @@ -299,5 +298,4 @@ private void OnDestroy() Shutdown(); } } -} -#endif // !DISABLESTEAMWORKS \ No newline at end of file +} \ No newline at end of file diff --git a/LegacyClient.cs b/LegacyClient.cs index 31ac344..54f937c 100644 --- a/LegacyClient.cs +++ b/LegacyClient.cs @@ -1,5 +1,4 @@ -#if !DISABLESTEAMWORKS -using Steamworks; +using Steamworks; using System; using System.Threading; using System.Threading.Tasks; @@ -167,5 +166,4 @@ protected override void OnReceiveInternalData(InternalMessages type, CSteamID cl protected override void OnConnectionFailed(CSteamID remoteId) => OnDisconnected.Invoke(); public void FlushData() { } } -} -#endif // !DISABLESTEAMWORKS \ No newline at end of file +} \ No newline at end of file diff --git a/LegacyCommon.cs b/LegacyCommon.cs index 7837ff5..49f64a1 100644 --- a/LegacyCommon.cs +++ b/LegacyCommon.cs @@ -1,5 +1,4 @@ -#if !DISABLESTEAMWORKS -using Steamworks; +using Steamworks; using System; using System.Collections; using UnityEngine; @@ -147,5 +146,4 @@ public void ReceiveData() protected abstract void OnReceiveData(byte[] data, CSteamID clientSteamID, int channel); protected abstract void OnConnectionFailed(CSteamID remoteId); } -} -#endif // !DISABLESTEAMWORKS \ No newline at end of file +} \ No newline at end of file diff --git a/LegacyServer.cs b/LegacyServer.cs index 7b556f6..ecfde8e 100644 --- a/LegacyServer.cs +++ b/LegacyServer.cs @@ -1,5 +1,4 @@ -#if !DISABLESTEAMWORKS -using Steamworks; +using Steamworks; using System; using System.Collections.Generic; using UnityEngine; @@ -151,5 +150,4 @@ protected override void OnConnectionFailed(CSteamID remoteId) } public void FlushData() { } } -} -#endif // !DISABLESTEAMWORKS \ No newline at end of file +} \ No newline at end of file diff --git a/NextClient.cs b/NextClient.cs index 60db518..62a36f5 100644 --- a/NextClient.cs +++ b/NextClient.cs @@ -1,4 +1,3 @@ -#if !DISABLESTEAMWORKS using Steamworks; using System; using System.Collections.Generic; @@ -217,5 +216,4 @@ public void FlushData() SteamNetworkingSockets.FlushMessagesOnConnection(HostConnection); } } -} -#endif // !DISABLESTEAMWORKS \ No newline at end of file +} \ No newline at end of file diff --git a/NextCommon.cs b/NextCommon.cs index 8ebd0c0..ad5c5c9 100644 --- a/NextCommon.cs +++ b/NextCommon.cs @@ -1,4 +1,3 @@ -#if !DISABLESTEAMWORKS using Mirror; using Steamworks; using System; @@ -40,4 +39,3 @@ protected EResult SendSocket(HSteamNetConnection conn, byte[] data, int channelI return (managedArray, channel); } } -#endif // !DISABLESTEAMWORKS \ No newline at end of file diff --git a/NextServer.cs b/NextServer.cs index 0220e0a..1065da9 100644 --- a/NextServer.cs +++ b/NextServer.cs @@ -1,4 +1,3 @@ -#if !DISABLESTEAMWORKS using Steamworks; using System; using System.Linq; @@ -203,5 +202,4 @@ public void Shutdown() } } } -} -#endif // !DISABLESTEAMWORKS \ No newline at end of file +} \ No newline at end of file