(5a377a8ee) Unstable v0.9.1000.0

This commit is contained in:
Juan Pablo Arce
2020-05-13 12:55:42 -03:00
parent b143329701
commit a1ca41aa5d
426 changed files with 14384 additions and 5708 deletions
@@ -1,7 +1,7 @@
using Lidgren.Network;
using System;
using System.Collections.Generic;
using System.IO;
using Barotrauma.IO;
using System.IO.Compression;
using System.Runtime.InteropServices;
using System.Text;
@@ -519,7 +519,7 @@ namespace Barotrauma.Networking
}
else
{
using (MemoryStream output = new MemoryStream())
using (System.IO.MemoryStream output = new System.IO.MemoryStream())
{
using (DeflateStream dstream = new DeflateStream(output, CompressionLevel.Fastest))
{
@@ -613,9 +613,9 @@ namespace Barotrauma.Networking
if (isCompressed)
{
byte[] decompressedData;
using (MemoryStream input = new MemoryStream(inBuf, startPos, inLength))
using (System.IO.MemoryStream input = new System.IO.MemoryStream(inBuf, startPos, inLength))
{
using (MemoryStream output = new MemoryStream())
using (System.IO.MemoryStream output = new System.IO.MemoryStream())
{
using (DeflateStream dstream = new DeflateStream(input, CompressionMode.Decompress))
{