Fixes code according to modern code style. Fixes a few expression bugs.

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

View file

@ -2,64 +2,65 @@ using Server.Targeting;
namespace Server
{
public delegate void BoundingBoxCallback( Mobile from, Map map, Point3D start, Point3D end, object state );
public delegate void BoundingBoxCallback(Mobile from, Map map, Point3D start, Point3D end, object state);
public class BoundingBoxPicker
{
public static void Begin( Mobile from, BoundingBoxCallback callback, object state )
{
from.SendMessage( "Target the first location of the bounding box." );
from.Target = new PickTarget( callback, state );
}
public class BoundingBoxPicker
{
public static void Begin(Mobile from, BoundingBoxCallback callback, object state)
{
from.SendMessage("Target the first location of the bounding box.");
from.Target = new PickTarget(callback, state);
}
private class PickTarget : Target
{
private Point3D m_Store;
private bool m_First;
private Map m_Map;
private BoundingBoxCallback m_Callback;
private object m_State;
private class PickTarget : Target
{
private BoundingBoxCallback m_Callback;
private bool m_First;
private Map m_Map;
private object m_State;
private Point3D m_Store;
public PickTarget( BoundingBoxCallback callback, object state ) : this( Point3D.Zero, true, null, callback, state )
{
}
public PickTarget(BoundingBoxCallback callback, object state) : this(Point3D.Zero, true, null, callback, state)
{
}
public PickTarget( Point3D store, bool first, Map map, BoundingBoxCallback callback, object state ) : base( -1, true, TargetFlags.None )
{
m_Store = store;
m_First = first;
m_Map = map;
m_Callback = callback;
m_State = state;
}
public PickTarget(Point3D store, bool first, Map map, BoundingBoxCallback callback, object state) : base(-1,
true, TargetFlags.None)
{
m_Store = store;
m_First = first;
m_Map = map;
m_Callback = callback;
m_State = state;
}
protected override void OnTarget( Mobile from, object targeted )
{
if ( !(targeted is IPoint3D p) )
return;
protected override void OnTarget(Mobile from, object targeted)
{
if (!(targeted is IPoint3D p))
return;
if ( p is Item item )
p = item.GetWorldTop();
if (p is Item item)
p = item.GetWorldTop();
if ( m_First )
{
from.SendMessage( "Target another location to complete the bounding box." );
from.Target = new PickTarget( new Point3D( p ), false, from.Map, m_Callback, m_State );
}
else if ( from.Map != m_Map )
{
from.SendMessage( "Both locations must reside on the same map." );
}
else if ( m_Map != null && m_Map != Map.Internal && m_Callback != null )
{
Point3D start = m_Store;
Point3D end = new Point3D( p );
if (m_First)
{
from.SendMessage("Target another location to complete the bounding box.");
from.Target = new PickTarget(new Point3D(p), false, from.Map, m_Callback, m_State);
}
else if (from.Map != m_Map)
{
from.SendMessage("Both locations must reside on the same map.");
}
else if (m_Map != null && m_Map != Map.Internal && m_Callback != null)
{
Point3D start = m_Store;
Point3D end = new Point3D(p);
Utility.FixPoints( ref start, ref end );
Utility.FixPoints(ref start, ref end);
m_Callback( from, m_Map, start, end, m_State );
}
}
}
}
}
m_Callback(from, m_Map, start, end, m_State);
}
}
}
}
}