From c35c32270b38129258465ea07415820aaccb4927 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Thu, 7 Nov 2019 14:32:35 -0500 Subject: [PATCH] Little cleanup --- .../DataStorage/ClientReader/BitReader.cs | 34 ++++++++----------- .../Entities/Object/Update/UpdateFields.cs | 8 ++--- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/Source/Game/DataStorage/ClientReader/BitReader.cs b/Source/Game/DataStorage/ClientReader/BitReader.cs index 8ec69a433..155d076a3 100644 --- a/Source/Game/DataStorage/ClientReader/BitReader.cs +++ b/Source/Game/DataStorage/ClientReader/BitReader.cs @@ -22,36 +22,32 @@ namespace Game.DataStorage { public class BitReader { - private byte[] m_data; - private int m_bitPosition; - private int m_offset; - - public int Position { get => m_bitPosition; set => m_bitPosition = value; } - public int Offset { get => m_offset; set => m_offset = value; } - public byte[] Data { get => m_data; set => m_data = value; } + public int Position { get; set; } + public int Offset { get; set; } + public byte[] Data { get; set; } public BitReader(byte[] data) { - m_data = data; + Data = data; } public BitReader(byte[] data, int offset) { - m_data = data; - m_offset = offset; + Data = data; + Offset = offset; } public T Read(int numBits) where T : unmanaged { - ulong result = Unsafe.As(ref m_data[m_offset + (m_bitPosition >> 3)]) << (64 - numBits - (m_bitPosition & 7)) >> (64 - numBits); - m_bitPosition += numBits; + ulong result = Unsafe.As(ref Data[Offset + (Position >> 3)]) << (64 - numBits - (Position & 7)) >> (64 - numBits); + Position += numBits; return Unsafe.As(ref result); } public T ReadSigned(int numBits) where T : unmanaged { - ulong result = Unsafe.As(ref m_data[m_offset + (m_bitPosition >> 3)]) << (64 - numBits - (m_bitPosition & 7)) >> (64 - numBits); - m_bitPosition += numBits; + ulong result = Unsafe.As(ref Data[Offset + (Position >> 3)]) << (64 - numBits - (Position & 7)) >> (64 - numBits); + Position += numBits; ulong signedShift = (1UL << (numBits - 1)); result = (signedShift ^ result) - signedShift; return Unsafe.As(ref result); @@ -59,13 +55,13 @@ namespace Game.DataStorage public string ReadCString() { - int start = m_bitPosition; + int start = Position; - while (m_data[m_offset + (m_bitPosition >> 3)] != 0) - m_bitPosition += 8; + while (Data[Offset + (Position >> 3)] != 0) + Position += 8; - string result = Encoding.UTF8.GetString(m_data, m_offset + (start >> 3), (m_bitPosition - start) >> 3); - m_bitPosition += 8; + string result = Encoding.UTF8.GetString(Data, Offset + (start >> 3), (Position - start) >> 3); + Position += 8; return result; } } diff --git a/Source/Game/Entities/Object/Update/UpdateFields.cs b/Source/Game/Entities/Object/Update/UpdateFields.cs index b2bee1748..e7d96ac94 100644 --- a/Source/Game/Entities/Object/Update/UpdateFields.cs +++ b/Source/Game/Entities/Object/Update/UpdateFields.cs @@ -639,8 +639,8 @@ namespace Game.Entities public class UnlockedAzeriteEssence { - uint AzeriteEssenceID; - uint Rank; + public uint AzeriteEssenceID; + public uint Rank; public void WriteCreate(WorldPacket data, Item owner, Player receiver) { @@ -916,8 +916,8 @@ namespace Game.Entities public class PassiveSpellHistory { - int SpellID; - int AuraSpellID; + public int SpellID; + public int AuraSpellID; public void WriteCreate(WorldPacket data, Unit owner, Player receiver) {