warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes code according to modern code style. Fixes a few expression bugs.

Browse source
This commit is contained in:
Kamron Batman 2018-09-15 09:58:51 -07:00
parent 89eea25e5f
commit 970fd563b2
3324 changed files with 441118 additions and 433755 deletions
Download patch file Download diff file Expand all files Collapse all files

209
Server/Network/ByteQueue.cs
View file

@ -22,130 +22,129 @@ using System;
namespace Server.Network
{
public class ByteQueue
{
private int m_Head;
private int m_Tail;
public class ByteQueue
{
private byte[] m_Buffer;
private int m_Head;
private int m_Tail;
private byte[] m_Buffer;
public ByteQueue()
{
m_Buffer = new byte[2048];
}
public int Length { get; private set; }
public int Length{ get; private set; }
public ByteQueue()
{
m_Buffer = new byte[2048];
}
public void Clear()
{
m_Head = 0;
m_Tail = 0;
Length = 0;
}
public void Clear()
{
m_Head = 0;
m_Tail = 0;
Length = 0;
}
private void SetCapacity(int capacity)
{
byte[] newBuffer = new byte[capacity];
private void SetCapacity( int capacity )
{
byte[] newBuffer = new byte[capacity];
if (Length > 0)
{
if (m_Head < m_Tail)
{
Buffer.BlockCopy(m_Buffer, m_Head, newBuffer, 0, Length);
}
else
{
Buffer.BlockCopy(m_Buffer, m_Head, newBuffer, 0, m_Buffer.Length - m_Head);
Buffer.BlockCopy(m_Buffer, 0, newBuffer, m_Buffer.Length - m_Head, m_Tail);
}
}
if ( Length > 0 )
{
if ( m_Head < m_Tail )
{
Buffer.BlockCopy( m_Buffer, m_Head, newBuffer, 0, Length );
}
else
{
Buffer.BlockCopy( m_Buffer, m_Head, newBuffer, 0, m_Buffer.Length - m_Head );
Buffer.BlockCopy( m_Buffer, 0, newBuffer, m_Buffer.Length - m_Head, m_Tail );
}
}
m_Head = 0;
m_Tail = Length;
m_Buffer = newBuffer;
}
m_Head = 0;
m_Tail = Length;
m_Buffer = newBuffer;
}
public byte GetPacketID()
{
if (Length >= 1)
return m_Buffer[m_Head];
public byte GetPacketID()
{
if ( Length >= 1 )
return m_Buffer[m_Head];
return 0xFF;
}
return 0xFF;
}
public int GetPacketLength()
{
if (Length >= 3)
return (m_Buffer[(m_Head + 1) % m_Buffer.Length] << 8) | m_Buffer[(m_Head + 2) % m_Buffer.Length];
public int GetPacketLength()
{
if ( Length >= 3 )
return (m_Buffer[(m_Head + 1) % m_Buffer.Length] << 8) | m_Buffer[(m_Head + 2) % m_Buffer.Length];
return 0;
}
return 0;
}
public int Dequeue(byte[] buffer, int offset, int size)
{
if (size > Length)
size = Length;
public int Dequeue( byte[] buffer, int offset, int size )
{
if ( size > Length )
size = Length;
if (size == 0)
return 0;
if ( size == 0 )
return 0;
if (m_Head < m_Tail)
{
Buffer.BlockCopy(m_Buffer, m_Head, buffer, offset, size);
}
else
{
int rightLength = m_Buffer.Length - m_Head;
if ( m_Head < m_Tail )
{
Buffer.BlockCopy( m_Buffer, m_Head, buffer, offset, size );
}
else
{
int rightLength = ( m_Buffer.Length - m_Head );
if (rightLength >= size)
{
Buffer.BlockCopy(m_Buffer, m_Head, buffer, offset, size);
}
else
{
Buffer.BlockCopy(m_Buffer, m_Head, buffer, offset, rightLength);
Buffer.BlockCopy(m_Buffer, 0, buffer, offset + rightLength, size - rightLength);
}
}
if ( rightLength >= size )
{
Buffer.BlockCopy( m_Buffer, m_Head, buffer, offset, size );
}
else
{
Buffer.BlockCopy( m_Buffer, m_Head, buffer, offset, rightLength );
Buffer.BlockCopy( m_Buffer, 0, buffer, offset + rightLength, size - rightLength );
}
}
m_Head = (m_Head + size) % m_Buffer.Length;
Length -= size;
m_Head = ( m_Head + size ) % m_Buffer.Length;
Length -= size;
if (Length == 0)
{
m_Head = 0;
m_Tail = 0;
}
if ( Length == 0 )
{
m_Head = 0;
m_Tail = 0;
}
return size;
}
return size;
}
public void Enqueue(byte[] buffer, int offset, int size)
{
if (Length + size > m_Buffer.Length)
SetCapacity((Length + size + 2047) & ~2047);
public void Enqueue( byte[] buffer, int offset, int size )
{
if ( (Length + size) > m_Buffer.Length )
SetCapacity( (Length + size + 2047) & ~2047 );
if (m_Head < m_Tail)
{
int rightLength = m_Buffer.Length - m_Tail;
if ( m_Head < m_Tail )
{
int rightLength = ( m_Buffer.Length - m_Tail );
if (rightLength >= size)
{
Buffer.BlockCopy(buffer, offset, m_Buffer, m_Tail, size);
}
else
{
Buffer.BlockCopy(buffer, offset, m_Buffer, m_Tail, rightLength);
Buffer.BlockCopy(buffer, offset + rightLength, m_Buffer, 0, size - rightLength);
}
}
else
{
Buffer.BlockCopy(buffer, offset, m_Buffer, m_Tail, size);
}
if ( rightLength >= size )
{
Buffer.BlockCopy( buffer, offset, m_Buffer, m_Tail, size );
}
else
{
Buffer.BlockCopy( buffer, offset, m_Buffer, m_Tail, rightLength );
Buffer.BlockCopy( buffer, offset + rightLength, m_Buffer, 0, size - rightLength );
}
}
else
{
Buffer.BlockCopy( buffer, offset, m_Buffer, m_Tail, size );
}
m_Tail = ( m_Tail + size ) % m_Buffer.Length;
Length += size;
}
}
m_Tail = (m_Tail + size) % m_Buffer.Length;
Length += size;
}
}
}