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

161
Scripts/Items/Misc/LOSBlocker.cs
View file

@ -2,113 +2,112 @@ using Server.Network;
namespace Server.Items
{
public class LOSBlocker : Item
{
public static void Initialize()
{
TileData.ItemTable[0x21A2].Flags = TileFlag.Wall | TileFlag.NoShoot;
TileData.ItemTable[0x21A2].Height = 20;
}
public class LOSBlocker : Item
{
[Constructible]
public LOSBlocker() : base(0x21A2)
{
Movable = false;
}
public override string DefaultName => "no line of sight";
public LOSBlocker(Serial serial) : base(serial)
{
}
[Constructible]
public LOSBlocker() : base( 0x21A2 )
{
Movable = false;
}
public override string DefaultName => "no line of sight";
public LOSBlocker( Serial serial ) : base( serial )
{
}
public static void Initialize()
{
TileData.ItemTable[0x21A2].Flags = TileFlag.Wall | TileFlag.NoShoot;
TileData.ItemTable[0x21A2].Height = 20;
}
protected override Packet GetWorldPacketFor( NetState state ) {
Mobile mob = state.Mobile;
protected override Packet GetWorldPacketFor(NetState state)
{
Mobile mob = state.Mobile;
if ( mob != null && mob.AccessLevel >= AccessLevel.GameMaster ) {
return new GMItemPacket( this );
}
if (mob != null && mob.AccessLevel >= AccessLevel.GameMaster) return new GMItemPacket(this);
return base.GetWorldPacketFor( state );
}
return base.GetWorldPacketFor(state);
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 1 );
}
writer.Write(1);
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
int version = reader.ReadInt();
if ( version < 1 && ItemID == 0x2199 )
ItemID = 0x21A2;
}
if (version < 1 && ItemID == 0x2199)
ItemID = 0x21A2;
}
public sealed class GMItemPacket : Packet
{
public GMItemPacket( Item item ) : base( 0x1A )
{
EnsureCapacity( 20 );
public sealed class GMItemPacket : Packet
{
public GMItemPacket(Item item) : base(0x1A)
{
EnsureCapacity(20);
// 14 base length
// +2 - Amount
// +2 - Hue
// +1 - Flags
// 14 base length
// +2 - Amount
// +2 - Hue
// +1 - Flags
uint serial = (uint)item.Serial.Value;
int itemID = 0x36FF;
int amount = item.Amount;
Point3D loc = item.Location;
int x = loc.X;
int y = loc.Y;
int hue = item.Hue;
int flags = item.GetPacketFlags();
int direction = (int)item.Direction;
uint serial = (uint)item.Serial.Value;
int itemID = 0x36FF;
int amount = item.Amount;
Point3D loc = item.Location;
int x = loc.X;
int y = loc.Y;
int hue = item.Hue;
int flags = item.GetPacketFlags();
int direction = (int)item.Direction;
if ( amount != 0 )
serial |= 0x80000000;
else
serial &= 0x7FFFFFFF;
if (amount != 0)
serial |= 0x80000000;
else
serial &= 0x7FFFFFFF;
m_Stream.Write( (uint) serial );
m_Stream.Write( (short) (itemID & 0x7FFF) );
m_Stream.Write(serial);
m_Stream.Write((short)(itemID & 0x7FFF));
if ( amount != 0 )
m_Stream.Write( (short) amount );
if (amount != 0)
m_Stream.Write((short)amount);
x &= 0x7FFF;
x &= 0x7FFF;
if ( direction != 0 )
x |= 0x8000;
if (direction != 0)
x |= 0x8000;
m_Stream.Write( (short) x );
m_Stream.Write((short)x);
y &= 0x3FFF;
y &= 0x3FFF;
if ( hue != 0 )
y |= 0x8000;
if (hue != 0)
y |= 0x8000;
if ( flags != 0 )
y |= 0x4000;
if (flags != 0)
y |= 0x4000;
m_Stream.Write( (short) y );
m_Stream.Write((short)y);
if ( direction != 0 )
m_Stream.Write( (byte) direction );
if (direction != 0)
m_Stream.Write((byte)direction);
m_Stream.Write( (sbyte) loc.Z );
m_Stream.Write((sbyte)loc.Z);
if ( hue != 0 )
m_Stream.Write( (ushort) hue );
if (hue != 0)
m_Stream.Write((ushort)hue);
if ( flags != 0 )
m_Stream.Write( (byte) flags );
}
}
}
if (flags != 0)
m_Stream.Write((byte)flags);
}
}
}
}