Compare commits

..

2 Commits

Author SHA1 Message Date
Fey
bcf31c7296 Merge branch 'master' of http://172.20.20.19:3000/ft/skyscraper8
Some checks failed
🚀 Pack skyscraper8 / make-zip (push) Failing after 40s
2026-05-14 11:00:26 +02:00
Fey
f086ca4f59 Moved WriteDoubleBE to it's proper position. 2026-05-14 10:59:28 +02:00
3 changed files with 423 additions and 431 deletions

View File

@ -522,10 +522,10 @@ namespace skyscraper5.Skyscraper.IO.RemoteStreamReader
switch (result)
{
case RemoteStreamReaderConstants.COMMAND_SUCCESSFUL:
pRFLevel = NetworkStreamExtensions.ReadDoubleBE(TcpStream);
pRFLevel = TcpStream.ReadDoubleBE();
return true;
case RemoteStreamReaderConstants.COMMAND_FAILED:
pRFLevel = NetworkStreamExtensions.ReadDoubleBE(TcpStream);
pRFLevel = TcpStream.ReadDoubleBE();
return false;
default:
throw new NotImplementedException(result.ToString());

View File

@ -200,16 +200,6 @@ namespace skyscraper5.Skyscraper.IO
return BitConverter.ToDouble(buffer, 0);
}
public static double ReadDoubleBE(this Stream stream)
{
byte[] buffer = new byte[8];
if (stream.Read(buffer, 0, 8) != 8)
throw new EndOfStreamException();
if (BitConverter.IsLittleEndian)
Array.Reverse(buffer, 0, 8);
return BitConverter.ToDouble(buffer, 0);
}
public static void WriteUInt8(this Stream stream, byte value)
{
byte[] buffer = new byte[1];
@ -397,5 +387,41 @@ namespace skyscraper5.Skyscraper.IO
}
return totalRead;
}
}
public static void WriteDoubleBE(this Stream stream, double value)
{
byte[] buffer = BitConverter.GetBytes(value);
if (BitConverter.IsLittleEndian)
Array.Reverse(buffer);
stream.Write(buffer, 0, 8);
}
public static double ReadDoubleBE(this Stream stream)
{
byte[] buffer = new byte[8];
if (stream.Read(buffer, 0, 8) != 8)
throw new EndOfStreamException("failed to read double");
if (BitConverter.IsLittleEndian)
Array.Reverse(buffer);
return BitConverter.ToDouble(buffer, 0);
}
public static void WriteFloatBE(this Stream stream, float value)
{
byte[] buffer = BitConverter.GetBytes(value);
if (BitConverter.IsLittleEndian)
Array.Reverse(buffer);
stream.Write(buffer, 0, 4);
}
public static float ReadFloatBE(this NetworkStream stream)
{
byte[] buffer = new byte[4];
if (stream.Read(buffer, 0, 4) != 4)
throw new EndOfStreamException("failed to read float");
if (BitConverter.IsLittleEndian)
Array.Reverse(buffer);
return BitConverter.ToSingle(buffer, 0);
}
}
}

View File

@ -152,41 +152,7 @@ namespace skyscraper5.Skyscraper.Net.Sockets
return buffer[0];
}
public static void WriteDoubleBE(this NetworkStream stream, double value)
{
byte[] buffer = BitConverter.GetBytes(value);
if (BitConverter.IsLittleEndian)
Array.Reverse(buffer);
stream.Write(buffer, 0, 8);
}
public static double ReadDoubleBE(this NetworkStream stream)
{
byte[] buffer = new byte[8];
if (stream.Read(buffer,0,8) != 8)
throw new EndOfStreamException("failed to read double");
if (BitConverter.IsLittleEndian)
Array.Reverse(buffer);
return BitConverter.ToDouble(buffer, 0);
}
public static void WriteFloatBE(this NetworkStream stream, float value)
{
byte[] buffer = BitConverter.GetBytes(value);
if (BitConverter.IsLittleEndian)
Array.Reverse(buffer);
stream.Write(buffer, 0, 4);
}
public static float ReadFloatBE(this NetworkStream stream)
{
byte[] buffer = new byte[4];
if (stream.Read(buffer, 0, 4) != 4)
throw new EndOfStreamException("failed to read float");
if (BitConverter.IsLittleEndian)
Array.Reverse(buffer);
return BitConverter.ToSingle(buffer, 0);
}
public static void WriteIntPtr(this NetworkStream stream, IntPtr ptr)
{