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

Browse source
This commit is contained in:
mark 2010-12-06 06:45:45 +00:00
parent 34d969712e
commit d444b9ba5c
70 changed files with 569 additions and 495 deletions
Download patch file Download diff file Expand all files Collapse all files

72
Server/Network/Packets.cs
View file

@ -265,7 +265,7 @@ namespace Server.Network
BuyItemState bis = (BuyItemState)list[i];
m_Stream.Write( (int)bis.MySerial );
m_Stream.Write( (ushort)(bis.ItemID & 0x3FFF) );
m_Stream.Write( (ushort)bis.ItemID );
m_Stream.Write( (byte)0 );//itemid offset
m_Stream.Write( (ushort)bis.Amount );
m_Stream.Write( (short)(i+1) );//x
@ -293,7 +293,7 @@ namespace Server.Network
BuyItemState bis = (BuyItemState)list[i];
m_Stream.Write( (int)bis.MySerial );
m_Stream.Write( (ushort)(bis.ItemID & 0x3FFF) );
m_Stream.Write( (ushort)bis.ItemID );
m_Stream.Write( (byte)0 );//itemid offset
m_Stream.Write( (ushort)bis.Amount );
m_Stream.Write( (short)(i+1) );//x
@ -366,7 +366,7 @@ namespace Server.Network
foreach ( SellItemState state in table.Values )
{
m_Stream.Write( (int) state.Item.Serial );
m_Stream.Write( (ushort) (state.Item.ItemID & 0x3FFF) );
m_Stream.Write( (ushort) state.Item.ItemID );
m_Stream.Write( (ushort) state.Item.Hue );
m_Stream.Write( (ushort) state.Item.Amount );
m_Stream.Write( (ushort) state.Price );
@ -769,7 +769,7 @@ namespace Server.Network
{
ItemListEntry e = entries[i];
m_Stream.Write( (short) (e.ItemID & 0x3FFF) );
m_Stream.Write( (ushort) e.ItemID );
m_Stream.Write( (short) e.Hue );
string name = e.Name;
@ -1021,7 +1021,7 @@ namespace Server.Network
// +1 - Flags
uint serial = (uint)item.Serial.Value;
int itemID = item.ItemID;
int itemID = item.ItemID & 0x3FFF;
int amount = item.Amount;
Point3D loc = item.Location;
int x = loc.m_X;
@ -1040,7 +1040,11 @@ namespace Server.Network
}
m_Stream.Write( (uint) serial );
m_Stream.Write( (short) (itemID & 0x7FFF) );
if ( item is BaseMulti )
m_Stream.Write( (short) (itemID | 0x4000) );
else
m_Stream.Write( (short) itemID );
if ( amount != 0 )
{
@ -1135,12 +1139,12 @@ namespace Server.Network
itemID &= 0x3FFF;
} else {
m_Stream.Write( (byte) 0x00 );
itemID &= 0x7FFF;
itemID &= 0xFFFF;
}
m_Stream.Write( (int) item.Serial );
m_Stream.Write( (short) itemID );
m_Stream.Write( (ushort) itemID );
m_Stream.Write( (byte) item.Direction );
@ -1701,13 +1705,8 @@ namespace Server.Network
parentSerial = Serial.Zero;
}
ushort cid = (ushort) item.ItemID;
if ( cid > 0x3FFF )
cid = 0x9D7;
m_Stream.Write( (int) item.Serial );
m_Stream.Write( (short) cid );
m_Stream.Write( (ushort) item.ItemID );
m_Stream.Write( (byte) 0 ); // signed, itemID offset
m_Stream.Write( (ushort) item.Amount );
m_Stream.Write( (short) item.X );
@ -1733,13 +1732,8 @@ namespace Server.Network
parentSerial = Serial.Zero;
}
ushort cid = (ushort) item.ItemID;
if ( cid > 0x3FFF )
cid = 0x9D7;
m_Stream.Write( (int) item.Serial );
m_Stream.Write( (short) cid );
m_Stream.Write( (ushort) item.ItemID );
m_Stream.Write( (byte) 0 ); // signed, itemID offset
m_Stream.Write( (ushort) item.Amount );
m_Stream.Write( (short) item.X );
@ -1773,13 +1767,8 @@ namespace Server.Network
{
Point3D loc = child.Location;
ushort cid = (ushort) child.ItemID;
if ( cid > 0x3FFF )
cid = 0x9D7;
m_Stream.Write( (int) child.Serial );
m_Stream.Write( (ushort) cid );
m_Stream.Write( (ushort) child.ItemID );
m_Stream.Write( (byte) 0 ); // signed, itemID offset
m_Stream.Write( (ushort) child.Amount );
m_Stream.Write( (short) loc.m_X );
@ -1819,13 +1808,8 @@ namespace Server.Network
{
Point3D loc = child.Location;
ushort cid = (ushort) child.ItemID;
if ( cid > 0x3FFF )
cid = 0x9D7;
m_Stream.Write( (int) child.Serial );
m_Stream.Write( (ushort) cid );
m_Stream.Write( (ushort) child.ItemID );
m_Stream.Write( (byte) 0 ); // signed, itemID offset
m_Stream.Write( (ushort) child.Amount );
m_Stream.Write( (short) loc.m_X );
@ -3185,14 +3169,14 @@ namespace Server.Network
if ( beheld.SolidHueOverride >= 0 )
hue = beheld.SolidHueOverride;
int itemID = item.ItemID & 0x3FFF;
int itemID = item.ItemID & 0x7FFF;
bool writeHue = ( hue != 0 );
if ( writeHue )
itemID |= 0x8000;
m_Stream.Write( (int) item.Serial );
m_Stream.Write( (short) itemID );
m_Stream.Write( (ushort) itemID );
m_Stream.Write( (byte) layer );
if ( writeHue )
@ -3210,7 +3194,7 @@ namespace Server.Network
if( beheld.SolidHueOverride >= 0 )
hue = beheld.SolidHueOverride;
int itemID = beheld.HairItemID & 0x3FFF;
int itemID = beheld.HairItemID & 0x7FFF;
bool writeHue = (hue != 0);
@ -3218,7 +3202,7 @@ namespace Server.Network
itemID |= 0x8000;
m_Stream.Write( (int)HairInfo.FakeSerial( beheld ) );
m_Stream.Write( (short)itemID );
m_Stream.Write( (ushort)itemID );
m_Stream.Write( (byte)Layer.Hair );
if( writeHue )
@ -3236,7 +3220,7 @@ namespace Server.Network
if( beheld.SolidHueOverride >= 0 )
hue = beheld.SolidHueOverride;
int itemID = beheld.FacialHairItemID & 0x3FFF;
int itemID = beheld.FacialHairItemID & 0x7FFF;
bool writeHue = (hue != 0);
@ -3244,7 +3228,7 @@ namespace Server.Network
itemID |= 0x8000;
m_Stream.Write( (int)FacialHairInfo.FakeSerial( beheld ) );
m_Stream.Write( (short)itemID );
m_Stream.Write( (ushort)itemID );
m_Stream.Write( (byte)Layer.FacialHair );
if( writeHue )
@ -3309,14 +3293,14 @@ namespace Server.Network
if ( beheld.SolidHueOverride >= 0 )
hue = beheld.SolidHueOverride;
int itemID = item.ItemID & 0x3FFF;
int itemID = item.ItemID & 0x7FFF;
bool writeHue = ( hue != 0 );
if ( writeHue )
itemID |= 0x8000;
m_Stream.Write( (int) item.Serial );
m_Stream.Write( (short) itemID );
m_Stream.Write( (ushort) itemID );
m_Stream.Write( (byte) layer );
if ( writeHue )
@ -3334,7 +3318,7 @@ namespace Server.Network
if( beheld.SolidHueOverride >= 0 )
hue = beheld.SolidHueOverride;
int itemID = beheld.HairItemID & 0x3FFF;
int itemID = beheld.HairItemID & 0x7FFF;
bool writeHue = (hue != 0);
@ -3342,7 +3326,7 @@ namespace Server.Network
itemID |= 0x8000;
m_Stream.Write( (int)HairInfo.FakeSerial( beheld ) );
m_Stream.Write( (short)itemID );
m_Stream.Write( (ushort)itemID );
m_Stream.Write( (byte)Layer.Hair );
if( writeHue )
@ -3360,7 +3344,7 @@ namespace Server.Network
if( beheld.SolidHueOverride >= 0 )
hue = beheld.SolidHueOverride;
int itemID = beheld.FacialHairItemID & 0x3FFF;
int itemID = beheld.FacialHairItemID & 0x7FFF;
bool writeHue = (hue != 0);
@ -3368,7 +3352,7 @@ namespace Server.Network
itemID |= 0x8000;
m_Stream.Write( (int)FacialHairInfo.FakeSerial( beheld ) );
m_Stream.Write( (short)itemID );
m_Stream.Write( (ushort)itemID );
m_Stream.Write( (byte)Layer.FacialHair );
if( writeHue )