From da540b4a67fac2fd0e9a48dc1468d345b39383cb Mon Sep 17 00:00:00 2001 From: John Hurliman Date: Sat, 12 Jan 2008 02:39:17 +0000 Subject: [PATCH] * Made Packet.TickCount internal * Added Packet.ResendCount so we can track the number of times a packet is resent (not implemented yet) git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@1619 52acb1d6-8a22-11de-b505-999d5b087335 --- libsecondlife/LLObject.cs | 4 ++-- libsecondlife/ObjectManager.cs | 4 ++-- libsecondlife/_Packets_.cs | 12 +++++++----- libsecondlife/mapgenerator/mapgenerator.cs | 3 ++- libsecondlife/mapgenerator/template.cs | 9 +++++---- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/libsecondlife/LLObject.cs b/libsecondlife/LLObject.cs index b2819e5d..e34a091f 100644 --- a/libsecondlife/LLObject.cs +++ b/libsecondlife/LLObject.cs @@ -470,9 +470,9 @@ namespace libsecondlife return (byte)(200 - (byte)Math.Round(pathScale / SCALE_QUANTA)); } - public static byte PackPathShear(float pathShear) + public static sbyte PackPathShear(float pathShear) { - return (byte)Math.Round(pathShear / SHEAR_QUANTA); + return (sbyte)Math.Round(pathShear / SHEAR_QUANTA); } /// diff --git a/libsecondlife/ObjectManager.cs b/libsecondlife/ObjectManager.cs index f1ef172e..2fb89a3c 100644 --- a/libsecondlife/ObjectManager.cs +++ b/libsecondlife/ObjectManager.cs @@ -703,8 +703,8 @@ namespace libsecondlife packet.ObjectData.PathRevolutions = LLObject.PackPathRevolutions(prim.PathRevolutions); packet.ObjectData.PathScaleX = LLObject.PackPathScale(prim.PathScaleX); packet.ObjectData.PathScaleY = LLObject.PackPathScale(prim.PathScaleY); - packet.ObjectData.PathShearX = LLObject.PackPathShear(prim.PathShearX); - packet.ObjectData.PathShearY = LLObject.PackPathShear(prim.PathShearY); + packet.ObjectData.PathShearX = (byte)LLObject.PackPathShear(prim.PathShearX); + packet.ObjectData.PathShearY = (byte)LLObject.PackPathShear(prim.PathShearY); packet.ObjectData.PathSkew = LLObject.PackPathTwist(prim.PathSkew); packet.ObjectData.PathTaperX = LLObject.PackPathTaper(prim.PathTaperX); packet.ObjectData.PathTaperY = LLObject.PackPathTaper(prim.PathTaperY); diff --git a/libsecondlife/_Packets_.cs b/libsecondlife/_Packets_.cs index 70bc651e..ddeb5bae 100644 --- a/libsecondlife/_Packets_.cs +++ b/libsecondlife/_Packets_.cs @@ -97,10 +97,11 @@ namespace libsecondlife.Packets public uint Sequence { get { return (uint)((Data[1] << 24) + (Data[2] << 16) + (Data[3] << 8) + Data[4]); } - set { - Data[1] = (byte)(value >> 24); Data[2] = (byte)(value >> 16); - Data[3] = (byte)(value >> 8); Data[4] = (byte)(value % 256); - } + set + { + Data[1] = (byte)(value >> 24); Data[2] = (byte)(value >> 16); + Data[3] = (byte)(value >> 8); Data[4] = (byte)(value % 256); + } } /// Numeric ID number of this packet public abstract ushort ID { get; set; } @@ -780,7 +781,8 @@ namespace libsecondlife.Packets public abstract PacketType Type { get; } public abstract void FromBytes(byte[] bytes, ref int i, ref int packetEnd, byte[] zeroBuffer); public abstract void FromBytes(Header header, byte[] bytes, ref int i, ref int packetEnd, byte[] zeroBuffer); - public int TickCount; + internal int TickCount; + internal int ResendCount; public abstract byte[] ToBytes(); public static PacketType GetType(ushort id, PacketFrequency frequency) diff --git a/libsecondlife/mapgenerator/mapgenerator.cs b/libsecondlife/mapgenerator/mapgenerator.cs index adc23465..b7747312 100644 --- a/libsecondlife/mapgenerator/mapgenerator.cs +++ b/libsecondlife/mapgenerator/mapgenerator.cs @@ -836,7 +836,8 @@ namespace mapgenerator " public abstract PacketType Type { get; }" + Environment.NewLine + " public abstract void FromBytes(byte[] bytes, ref int i, ref int packetEnd, byte[] zeroBuffer);" + Environment.NewLine + " public abstract void FromBytes(Header header, byte[] bytes, ref int i, ref int packetEnd, byte[] zeroBuffer);" + Environment.NewLine + - " public int TickCount;" + Environment.NewLine + Environment.NewLine + + " internal int TickCount;" + Environment.NewLine + + " internal int ResendCount;" + Environment.NewLine + Environment.NewLine + " public abstract byte[] ToBytes();" //+ Environment.NewLine + Environment.NewLine + //" public void ToXml(XmlWriter xmlWriter)" + Environment.NewLine + //" {" + Environment.NewLine + diff --git a/libsecondlife/mapgenerator/template.cs b/libsecondlife/mapgenerator/template.cs index 4f7e2a30..60ed9438 100644 --- a/libsecondlife/mapgenerator/template.cs +++ b/libsecondlife/mapgenerator/template.cs @@ -97,10 +97,11 @@ namespace libsecondlife.Packets public uint Sequence { get { return (uint)((Data[1] << 24) + (Data[2] << 16) + (Data[3] << 8) + Data[4]); } - set { - Data[1] = (byte)(value >> 24); Data[2] = (byte)(value >> 16); - Data[3] = (byte)(value >> 8); Data[4] = (byte)(value % 256); - } + set + { + Data[1] = (byte)(value >> 24); Data[2] = (byte)(value >> 16); + Data[3] = (byte)(value >> 8); Data[4] = (byte)(value % 256); + } } /// Numeric ID number of this packet public abstract ushort ID { get; set; }