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

massive branch sync

Browse source
This commit is contained in:
mark 2010-04-25 06:09:43 +00:00
parent 489bbabe93
commit b3e8ec0a08
192 changed files with 1249 additions and 1124 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Server/Network/PacketHandlers.cs
View file

@ -400,7 +400,7 @@ namespace Server.Network
if ( (msgSize / 7) > 100 )
return;
ArrayList buyList = new ArrayList( msgSize/7 );
List<BuyItemResponse> buyList = new List<BuyItemResponse>( msgSize / 7 );
for ( ;msgSize>0;msgSize-=7)
{
byte layer = pvSrc.ReadByte();
@ -442,7 +442,7 @@ namespace Server.Network
int count = pvSrc.ReadUInt16();
if ( count < 100 && pvSrc.Size == (1+2+4+2+(count*6)) )
{
ArrayList sellList = new ArrayList( count );
List<SellItemResponse> sellList = new List<SellItemResponse>( count );
for (int i=0;i<count;i++)
{
@ -764,8 +764,8 @@ namespace Server.Network
{
int skillIndex;
try{ skillIndex = Convert.ToInt32( command.Split( ' ' )[0] ); }
catch{ break; }
if ( !int.TryParse( command.Split( ' ' )[0], out skillIndex ) )
break;
Skills.UseSkill( m, skillIndex );
@ -775,8 +775,8 @@ namespace Server.Network
{
int booktype;
try{ booktype = Convert.ToInt32( command ); }
catch{ booktype = 1; }
if ( !int.TryParse( command, out booktype ) )
booktype = 1;
EventSink.InvokeOpenSpellbookRequest( new OpenSpellbookRequestEventArgs( m, booktype ) );

16
Server/Network/Packets.cs
View file

@ -251,7 +251,8 @@ namespace Server.Network
public sealed class VendorBuyContent : Packet
{
public VendorBuyContent( ArrayList list ) : base( 0x3c )
public VendorBuyContent( List<BuyItemState> list )
: base( 0x3c )
{
this.EnsureCapacity( list.Count*19 + 5 );
@ -277,9 +278,9 @@ namespace Server.Network
}
}
public sealed class VendorBuyContent6017 : Packet
public sealed class VendorBuyContent6017 : Packet
{
public VendorBuyContent6017( ArrayList list ) : base( 0x3c )
public VendorBuyContent6017( List<BuyItemState> list ) : base( 0x3c )
{
this.EnsureCapacity( list.Count*20 + 5 );
@ -317,7 +318,8 @@ namespace Server.Network
public sealed class VendorBuyList : Packet
{
public VendorBuyList( Mobile vendor, ArrayList list ) : base( 0x74 )
public VendorBuyList( Mobile vendor, List<BuyItemState> list )
: base( 0x74 )
{
this.EnsureCapacity( 256 );
@ -328,7 +330,7 @@ namespace Server.Network
for ( int i = 0; i < list.Count; ++i )
{
BuyItemState bis = (BuyItemState)list[i];
BuyItemState bis = list[i];
m_Stream.Write( (int) bis.Price );
@ -1607,7 +1609,7 @@ namespace Server.Network
}
}
public sealed class ContainerContentUpdate6017 : Packet
public sealed class ContainerContentUpdate6017 : Packet
{
public ContainerContentUpdate6017( Item item ) : base( 0x25, 21 )
{
@ -1686,7 +1688,7 @@ namespace Server.Network
}
}
public sealed class ContainerContent6017 : Packet
public sealed class ContainerContent6017 : Packet
{
public ContainerContent6017( Mobile beholder, Item beheld ) : base( 0x3C )
{