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

192
Server/Serial.cs
View file

@ -22,125 +22,129 @@ using System;
namespace Server
{
public struct Serial : IComparable, IComparable<Serial>
{
public static Serial LastMobile { get; private set; } = Zero;
public struct Serial : IComparable, IComparable<Serial>
{
public static readonly Serial MinusOne = new Serial(-1);
public static readonly Serial Zero = new Serial(0);
public static Serial LastItem { get; private set; } = 0x40000000;
public static Serial LastMobile{ get; private set; } = Zero;
public static readonly Serial MinusOne = new Serial( -1 );
public static readonly Serial Zero = new Serial( 0 );
public static Serial LastItem{ get; private set; } = 0x40000000;
public static Serial NewMobile
{
get
{
while ( World.FindMobile( LastMobile = (LastMobile + 1) ) != null );
public static Serial NewMobile
{
get
{
while (World.FindMobile(LastMobile = LastMobile + 1) != null)
{
}
return LastMobile;
}
}
return LastMobile;
}
}
public static Serial NewItem
{
get
{
while ( World.FindItem( LastItem = (LastItem + 1) ) != null );
public static Serial NewItem
{
get
{
while (World.FindItem(LastItem = LastItem + 1) != null)
{
}
return LastItem;
}
}
return LastItem;
}
}
private Serial( int serial )
{
Value = serial;
}
private Serial(int serial)
{
Value = serial;
}
public int Value { get; }
public int Value{ get; }
public bool IsMobile => ( Value > 0 && Value < 0x40000000 );
public bool IsMobile => Value > 0 && Value < 0x40000000;
public bool IsItem => ( Value >= 0x40000000 && Value <= 0x7FFFFFFF );
public bool IsItem => Value >= 0x40000000 && Value <= 0x7FFFFFFF;
public bool IsValid => ( Value > 0 );
public bool IsValid => Value > 0;
public override int GetHashCode()
{
return Value;
}
public override int GetHashCode()
{
return Value;
}
public int CompareTo( Serial other )
{
return Value.CompareTo( other.Value );
}
public int CompareTo(Serial other)
{
return Value.CompareTo(other.Value);
}
public int CompareTo( object other )
{
if ( other is Serial serial )
return CompareTo( serial );
public int CompareTo(object other)
{
if (other is Serial serial)
return CompareTo(serial);
if ( other == null )
return -1;
if (other == null)
return -1;
throw new ArgumentException();
}
throw new ArgumentException();
}
public override bool Equals( object o )
{
if ( !(o is Serial serial) )
return false;
public override bool Equals(object o)
{
if (!(o is Serial serial))
return false;
return serial.Value == Value;
}
return serial.Value == Value;
}
public static bool operator == ( Serial l, Serial r )
{
return l.Value == r.Value;
}
public static bool operator ==(Serial l, Serial r)
{
return l.Value == r.Value;
}
public static bool operator != ( Serial l, Serial r )
{
return l.Value != r.Value;
}
public static bool operator !=(Serial l, Serial r)
{
return l.Value != r.Value;
}
public static bool operator > ( Serial l, Serial r )
{
return l.Value > r.Value;
}
public static bool operator >(Serial l, Serial r)
{
return l.Value > r.Value;
}
public static bool operator < ( Serial l, Serial r )
{
return l.Value < r.Value;
}
public static bool operator <(Serial l, Serial r)
{
return l.Value < r.Value;
}
public static bool operator >= ( Serial l, Serial r )
{
return l.Value >= r.Value;
}
public static bool operator >=(Serial l, Serial r)
{
return l.Value >= r.Value;
}
public static bool operator <= ( Serial l, Serial r )
{
return l.Value <= r.Value;
}
public static bool operator <=(Serial l, Serial r)
{
return l.Value <= r.Value;
}
/*public static Serial operator ++ ( Serial l )
{
return new Serial( l + 1 );
}*/
/*public static Serial operator ++ ( Serial l )
{
return new Serial( l + 1 );
}*/
public override string ToString()
{
return $"0x{Value:X8}";
}
public override string ToString()
{
return $"0x{Value:X8}";
}
public static implicit operator int( Serial a )
{
return a.Value;
}
public static implicit operator int(Serial a)
{
return a.Value;
}
public static implicit operator Serial( int a )
{
return new Serial( a );
}
}
}
public static implicit operator Serial(int a)
{
return new Serial(a);
}
}
}