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

248
Server/Items/VirtualHair.cs
View file

@ -22,151 +22,151 @@ using Server.Network;
namespace Server
{
public abstract class BaseHairInfo
{
[CommandProperty( AccessLevel.GameMaster )]
public int ItemID { get; set; }
public abstract class BaseHairInfo
{
protected BaseHairInfo(int itemid)
: this(itemid, 0)
{
}
[CommandProperty( AccessLevel.GameMaster )]
public int Hue { get; set; }
protected BaseHairInfo(int itemid, int hue)
{
ItemID = itemid;
Hue = hue;
}
protected BaseHairInfo( int itemid )
: this( itemid, 0 )
{
}
protected BaseHairInfo(GenericReader reader)
{
int version = reader.ReadInt();
protected BaseHairInfo( int itemid, int hue )
{
ItemID = itemid;
Hue = hue;
}
switch (version)
{
case 0:
{
ItemID = reader.ReadInt();
Hue = reader.ReadInt();
break;
}
}
}
protected BaseHairInfo( GenericReader reader )
{
int version = reader.ReadInt();
[CommandProperty(AccessLevel.GameMaster)]
public int ItemID{ get; set; }
switch( version )
{
case 0:
{
ItemID = reader.ReadInt();
Hue = reader.ReadInt();
break;
}
}
}
[CommandProperty(AccessLevel.GameMaster)]
public int Hue{ get; set; }
public virtual void Serialize( GenericWriter writer )
{
writer.Write( (int)0 ); //version
writer.Write( (int)ItemID );
writer.Write( (int)Hue );
}
}
public virtual void Serialize(GenericWriter writer)
{
writer.Write(0); //version
writer.Write(ItemID);
writer.Write(Hue);
}
}
public class HairInfo : BaseHairInfo
{
public HairInfo( int itemid )
: base( itemid, 0 )
{
}
public class HairInfo : BaseHairInfo
{
public HairInfo(int itemid)
: base(itemid, 0)
{
}
public HairInfo( int itemid, int hue )
: base( itemid, hue )
{
}
public HairInfo(int itemid, int hue)
: base(itemid, hue)
{
}
public HairInfo( GenericReader reader )
: base( reader )
{
}
public HairInfo(GenericReader reader)
: base(reader)
{
}
public static int FakeSerial( Mobile parent )
{
return (0x7FFFFFFF - 0x400 - (parent.Serial * 4));
}
}
public static int FakeSerial(Mobile parent)
{
return 0x7FFFFFFF - 0x400 - parent.Serial * 4;
}
}
public class FacialHairInfo : BaseHairInfo
{
public FacialHairInfo( int itemid )
: base( itemid, 0 )
{
}
public class FacialHairInfo : BaseHairInfo
{
public FacialHairInfo(int itemid)
: base(itemid, 0)
{
}
public FacialHairInfo( int itemid, int hue )
: base( itemid, hue )
{
}
public FacialHairInfo(int itemid, int hue)
: base(itemid, hue)
{
}
public FacialHairInfo( GenericReader reader )
: base( reader )
{
}
public FacialHairInfo(GenericReader reader)
: base(reader)
{
}
public static int FakeSerial( Mobile parent )
{
return (0x7FFFFFFF - 0x400 - 1 - (parent.Serial * 4));
}
}
public static int FakeSerial(Mobile parent)
{
return 0x7FFFFFFF - 0x400 - 1 - parent.Serial * 4;
}
}
public sealed class HairEquipUpdate : Packet
{
public HairEquipUpdate( Mobile parent )
: base( 0x2E, 15 )
{
int hue = parent.HairHue;
public sealed class HairEquipUpdate : Packet
{
public HairEquipUpdate(Mobile parent)
: base(0x2E, 15)
{
int hue = parent.HairHue;
if ( parent.SolidHueOverride >= 0 )
hue = parent.SolidHueOverride;
if (parent.SolidHueOverride >= 0)
hue = parent.SolidHueOverride;
int hairSerial = HairInfo.FakeSerial( parent );
int hairSerial = HairInfo.FakeSerial(parent);
m_Stream.Write( (int)hairSerial );
m_Stream.Write( (short)parent.HairItemID );
m_Stream.Write( (byte)0 );
m_Stream.Write( (byte)Layer.Hair );
m_Stream.Write( (int)parent.Serial );
m_Stream.Write( (short)hue );
}
}
m_Stream.Write(hairSerial);
m_Stream.Write((short)parent.HairItemID);
m_Stream.Write((byte)0);
m_Stream.Write((byte)Layer.Hair);
m_Stream.Write(parent.Serial);
m_Stream.Write((short)hue);
}
}
public sealed class FacialHairEquipUpdate : Packet
{
public FacialHairEquipUpdate( Mobile parent )
: base( 0x2E, 15 )
{
int hue = parent.FacialHairHue;
public sealed class FacialHairEquipUpdate : Packet
{
public FacialHairEquipUpdate(Mobile parent)
: base(0x2E, 15)
{
int hue = parent.FacialHairHue;
if ( parent.SolidHueOverride >= 0 )
hue = parent.SolidHueOverride;
if (parent.SolidHueOverride >= 0)
hue = parent.SolidHueOverride;
int hairSerial = FacialHairInfo.FakeSerial( parent );
int hairSerial = FacialHairInfo.FakeSerial(parent);
m_Stream.Write( (int)hairSerial );
m_Stream.Write( (short)parent.FacialHairItemID );
m_Stream.Write( (byte)0 );
m_Stream.Write( (byte)Layer.FacialHair );
m_Stream.Write( (int)parent.Serial );
m_Stream.Write( (short)hue );
}
}
m_Stream.Write(hairSerial);
m_Stream.Write((short)parent.FacialHairItemID);
m_Stream.Write((byte)0);
m_Stream.Write((byte)Layer.FacialHair);
m_Stream.Write(parent.Serial);
m_Stream.Write((short)hue);
}
}
public sealed class RemoveHair : Packet
{
public RemoveHair( Mobile parent )
: base( 0x1D, 5 )
{
m_Stream.Write( (int)HairInfo.FakeSerial( parent ) );
}
}
public sealed class RemoveHair : Packet
{
public RemoveHair(Mobile parent)
: base(0x1D, 5)
{
m_Stream.Write(HairInfo.FakeSerial(parent));
}
}
public sealed class RemoveFacialHair : Packet
{
public RemoveFacialHair( Mobile parent )
: base( 0x1D, 5 )
{
m_Stream.Write( (int)FacialHairInfo.FakeSerial( parent ) );
}
}
}
public sealed class RemoveFacialHair : Packet
{
public RemoveFacialHair(Mobile parent)
: base(0x1D, 5)
{
m_Stream.Write(FacialHairInfo.FakeSerial(parent));
}
}
}