Fixes code according to modern code style. Fixes a few expression bugs.
This commit is contained in:
Kamron Batman
parent
89eea25e5f
commit
970fd563b2
3324 changed files with 441118 additions and 433755 deletions
|
|
@ -2,40 +2,40 @@ using System.Xml;
|
|||
|
||||
namespace Server.Gumps
|
||||
{
|
||||
public class ChildNode
|
||||
{
|
||||
public ChildNode( XmlTextReader xml, ParentNode parent )
|
||||
{
|
||||
Parent = parent;
|
||||
public class ChildNode
|
||||
{
|
||||
public ChildNode(XmlTextReader xml, ParentNode parent)
|
||||
{
|
||||
Parent = parent;
|
||||
|
||||
Parse( xml );
|
||||
}
|
||||
Parse(xml);
|
||||
}
|
||||
|
||||
private void Parse( XmlTextReader xml )
|
||||
{
|
||||
if ( xml.MoveToAttribute( "name" ) )
|
||||
Name = xml.Value;
|
||||
else
|
||||
Name = "empty";
|
||||
public ParentNode Parent{ get; }
|
||||
|
||||
int x = 0, y = 0, z = 0;
|
||||
public string Name{ get; private set; }
|
||||
|
||||
if ( xml.MoveToAttribute( "x" ) )
|
||||
x = Utility.ToInt32( xml.Value );
|
||||
public Point3D Location{ get; private set; }
|
||||
|
||||
if ( xml.MoveToAttribute( "y" ) )
|
||||
y = Utility.ToInt32( xml.Value );
|
||||
private void Parse(XmlTextReader xml)
|
||||
{
|
||||
if (xml.MoveToAttribute("name"))
|
||||
Name = xml.Value;
|
||||
else
|
||||
Name = "empty";
|
||||
|
||||
if ( xml.MoveToAttribute( "z" ) )
|
||||
z = Utility.ToInt32( xml.Value );
|
||||
int x = 0, y = 0, z = 0;
|
||||
|
||||
Location = new Point3D( x, y, z );
|
||||
}
|
||||
if (xml.MoveToAttribute("x"))
|
||||
x = Utility.ToInt32(xml.Value);
|
||||
|
||||
public ParentNode Parent { get; }
|
||||
if (xml.MoveToAttribute("y"))
|
||||
y = Utility.ToInt32(xml.Value);
|
||||
|
||||
public string Name { get; private set; }
|
||||
if (xml.MoveToAttribute("z"))
|
||||
z = Utility.ToInt32(xml.Value);
|
||||
|
||||
public Point3D Location { get; private set; }
|
||||
}
|
||||
Location = new Point3D(x, y, z);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,241 +1,244 @@
|
|||
using System;
|
||||
using Server.Network;
|
||||
|
||||
namespace Server.Gumps
|
||||
{
|
||||
public class GoGump : Gump
|
||||
{
|
||||
public static readonly LocationTree Felucca = new LocationTree( "felucca.xml", Map.Felucca );
|
||||
public static readonly LocationTree Trammel = new LocationTree( "trammel.xml", Map.Trammel );
|
||||
public static readonly LocationTree Ilshenar = new LocationTree( "ilshenar.xml", Map.Ilshenar );
|
||||
public static readonly LocationTree Malas = new LocationTree( "malas.xml", Map.Malas );
|
||||
public static readonly LocationTree Tokuno = new LocationTree( "tokuno.xml", Map.Tokuno );
|
||||
public class GoGump : Gump
|
||||
{
|
||||
public static readonly LocationTree Felucca = new LocationTree("felucca.xml", Map.Felucca);
|
||||
public static readonly LocationTree Trammel = new LocationTree("trammel.xml", Map.Trammel);
|
||||
public static readonly LocationTree Ilshenar = new LocationTree("ilshenar.xml", Map.Ilshenar);
|
||||
public static readonly LocationTree Malas = new LocationTree("malas.xml", Map.Malas);
|
||||
public static readonly LocationTree Tokuno = new LocationTree("tokuno.xml", Map.Tokuno);
|
||||
|
||||
public static bool OldStyle = PropsConfig.OldStyle;
|
||||
public static bool OldStyle = PropsConfig.OldStyle;
|
||||
|
||||
public static readonly int GumpOffsetX = PropsConfig.GumpOffsetX;
|
||||
public static readonly int GumpOffsetY = PropsConfig.GumpOffsetY;
|
||||
public static readonly int GumpOffsetX = PropsConfig.GumpOffsetX;
|
||||
public static readonly int GumpOffsetY = PropsConfig.GumpOffsetY;
|
||||
|
||||
public static readonly int TextHue = PropsConfig.TextHue;
|
||||
public static readonly int TextOffsetX = PropsConfig.TextOffsetX;
|
||||
public static readonly int TextHue = PropsConfig.TextHue;
|
||||
public static readonly int TextOffsetX = PropsConfig.TextOffsetX;
|
||||
|
||||
public static readonly int OffsetGumpID = PropsConfig.OffsetGumpID;
|
||||
public static readonly int HeaderGumpID = PropsConfig.HeaderGumpID;
|
||||
public static readonly int EntryGumpID = PropsConfig.EntryGumpID;
|
||||
public static readonly int BackGumpID = PropsConfig.BackGumpID;
|
||||
public static readonly int SetGumpID = PropsConfig.SetGumpID;
|
||||
public static readonly int OffsetGumpID = PropsConfig.OffsetGumpID;
|
||||
public static readonly int HeaderGumpID = PropsConfig.HeaderGumpID;
|
||||
public static readonly int EntryGumpID = PropsConfig.EntryGumpID;
|
||||
public static readonly int BackGumpID = PropsConfig.BackGumpID;
|
||||
public static readonly int SetGumpID = PropsConfig.SetGumpID;
|
||||
|
||||
public static readonly int SetWidth = PropsConfig.SetWidth;
|
||||
public static readonly int SetOffsetX = PropsConfig.SetOffsetX, SetOffsetY = PropsConfig.SetOffsetY;
|
||||
public static readonly int SetButtonID1 = PropsConfig.SetButtonID1;
|
||||
public static readonly int SetButtonID2 = PropsConfig.SetButtonID2;
|
||||
public static readonly int SetWidth = PropsConfig.SetWidth;
|
||||
public static readonly int SetOffsetX = PropsConfig.SetOffsetX, SetOffsetY = PropsConfig.SetOffsetY;
|
||||
public static readonly int SetButtonID1 = PropsConfig.SetButtonID1;
|
||||
public static readonly int SetButtonID2 = PropsConfig.SetButtonID2;
|
||||
|
||||
public static readonly int PrevWidth = PropsConfig.PrevWidth;
|
||||
public static readonly int PrevOffsetX = PropsConfig.PrevOffsetX, PrevOffsetY = PropsConfig.PrevOffsetY;
|
||||
public static readonly int PrevButtonID1 = PropsConfig.PrevButtonID1;
|
||||
public static readonly int PrevButtonID2 = PropsConfig.PrevButtonID2;
|
||||
public static readonly int PrevWidth = PropsConfig.PrevWidth;
|
||||
public static readonly int PrevOffsetX = PropsConfig.PrevOffsetX, PrevOffsetY = PropsConfig.PrevOffsetY;
|
||||
public static readonly int PrevButtonID1 = PropsConfig.PrevButtonID1;
|
||||
public static readonly int PrevButtonID2 = PropsConfig.PrevButtonID2;
|
||||
|
||||
public static readonly int NextWidth = PropsConfig.NextWidth;
|
||||
public static readonly int NextOffsetX = PropsConfig.NextOffsetX, NextOffsetY = PropsConfig.NextOffsetY;
|
||||
public static readonly int NextButtonID1 = PropsConfig.NextButtonID1;
|
||||
public static readonly int NextButtonID2 = PropsConfig.NextButtonID2;
|
||||
public static readonly int NextWidth = PropsConfig.NextWidth;
|
||||
public static readonly int NextOffsetX = PropsConfig.NextOffsetX, NextOffsetY = PropsConfig.NextOffsetY;
|
||||
public static readonly int NextButtonID1 = PropsConfig.NextButtonID1;
|
||||
public static readonly int NextButtonID2 = PropsConfig.NextButtonID2;
|
||||
|
||||
public static readonly int OffsetSize = PropsConfig.OffsetSize;
|
||||
public static readonly int OffsetSize = PropsConfig.OffsetSize;
|
||||
|
||||
public static readonly int EntryHeight = PropsConfig.EntryHeight;
|
||||
public static readonly int BorderSize = PropsConfig.BorderSize;
|
||||
public static readonly int EntryHeight = PropsConfig.EntryHeight;
|
||||
public static readonly int BorderSize = PropsConfig.BorderSize;
|
||||
|
||||
private static bool PrevLabel = false, NextLabel = false;
|
||||
private static bool PrevLabel = false, NextLabel = false;
|
||||
|
||||
private static readonly int PrevLabelOffsetX = PrevWidth + 1;
|
||||
private static readonly int PrevLabelOffsetY = 0;
|
||||
private static readonly int PrevLabelOffsetX = PrevWidth + 1;
|
||||
private static readonly int PrevLabelOffsetY = 0;
|
||||
|
||||
private static readonly int NextLabelOffsetX = -29;
|
||||
private static readonly int NextLabelOffsetY = 0;
|
||||
private static readonly int NextLabelOffsetX = -29;
|
||||
private static readonly int NextLabelOffsetY = 0;
|
||||
|
||||
private static readonly int EntryWidth = 180;
|
||||
private static readonly int EntryCount = 15;
|
||||
private static readonly int EntryWidth = 180;
|
||||
private static readonly int EntryCount = 15;
|
||||
|
||||
private static readonly int TotalWidth = OffsetSize + EntryWidth + OffsetSize + SetWidth + OffsetSize;
|
||||
private static readonly int TotalHeight = OffsetSize + ((EntryHeight + OffsetSize) * (EntryCount + 1));
|
||||
private static readonly int TotalWidth = OffsetSize + EntryWidth + OffsetSize + SetWidth + OffsetSize;
|
||||
private static readonly int TotalHeight = OffsetSize + (EntryHeight + OffsetSize) * (EntryCount + 1);
|
||||
|
||||
private static readonly int BackWidth = BorderSize + TotalWidth + BorderSize;
|
||||
private static readonly int BackHeight = BorderSize + TotalHeight + BorderSize;
|
||||
private static readonly int BackWidth = BorderSize + TotalWidth + BorderSize;
|
||||
private static readonly int BackHeight = BorderSize + TotalHeight + BorderSize;
|
||||
private ParentNode m_Node;
|
||||
private int m_Page;
|
||||
|
||||
public static void DisplayTo( Mobile from )
|
||||
{
|
||||
LocationTree tree;
|
||||
private LocationTree m_Tree;
|
||||
|
||||
if ( from.Map == Map.Ilshenar )
|
||||
tree = Ilshenar;
|
||||
else if ( from.Map == Map.Felucca )
|
||||
tree = Felucca;
|
||||
else if ( from.Map == Map.Trammel )
|
||||
tree = Trammel;
|
||||
else if ( from.Map == Map.Malas )
|
||||
tree = Malas;
|
||||
else
|
||||
tree = Tokuno;
|
||||
private GoGump(int page, Mobile from, LocationTree tree, ParentNode node) : base(50, 50)
|
||||
{
|
||||
from.CloseGump(typeof(GoGump));
|
||||
|
||||
tree.LastBranch.TryGetValue( from, out ParentNode branch );
|
||||
tree.LastBranch[from] = node;
|
||||
|
||||
if ( branch == null )
|
||||
branch = tree.Root;
|
||||
m_Page = page;
|
||||
m_Tree = tree;
|
||||
m_Node = node;
|
||||
|
||||
if ( branch != null )
|
||||
from.SendGump( new GoGump( 0, from, tree, branch ) );
|
||||
}
|
||||
int x = BorderSize + OffsetSize;
|
||||
int y = BorderSize + OffsetSize;
|
||||
|
||||
private LocationTree m_Tree;
|
||||
private ParentNode m_Node;
|
||||
private int m_Page;
|
||||
int count = node.Children.Length - page * EntryCount;
|
||||
|
||||
private GoGump( int page, Mobile from, LocationTree tree, ParentNode node ) : base( 50, 50 )
|
||||
{
|
||||
from.CloseGump( typeof( GoGump ) );
|
||||
if (count < 0)
|
||||
count = 0;
|
||||
else if (count > EntryCount)
|
||||
count = EntryCount;
|
||||
|
||||
tree.LastBranch[from] = node;
|
||||
int totalHeight = OffsetSize + (EntryHeight + OffsetSize) * (count + 1);
|
||||
|
||||
m_Page = page;
|
||||
m_Tree = tree;
|
||||
m_Node = node;
|
||||
AddPage(0);
|
||||
|
||||
int x = BorderSize + OffsetSize;
|
||||
int y = BorderSize + OffsetSize;
|
||||
AddBackground(0, 0, BackWidth, BorderSize + totalHeight + BorderSize, BackGumpID);
|
||||
AddImageTiled(BorderSize, BorderSize, TotalWidth - (OldStyle ? SetWidth + OffsetSize : 0), totalHeight,
|
||||
OffsetGumpID);
|
||||
|
||||
int count = node.Children.Length - (page * EntryCount);
|
||||
if (OldStyle)
|
||||
AddImageTiled(x, y, TotalWidth - OffsetSize * 3 - SetWidth, EntryHeight, HeaderGumpID);
|
||||
else
|
||||
AddImageTiled(x, y, PrevWidth, EntryHeight, HeaderGumpID);
|
||||
|
||||
if ( count < 0 )
|
||||
count = 0;
|
||||
else if ( count > EntryCount )
|
||||
count = EntryCount;
|
||||
if (node.Parent != null)
|
||||
{
|
||||
AddButton(x + PrevOffsetX, y + PrevOffsetY, PrevButtonID1, PrevButtonID2, 1, GumpButtonType.Reply, 0);
|
||||
|
||||
int totalHeight = OffsetSize + ((EntryHeight + OffsetSize) * (count + 1));
|
||||
if (PrevLabel)
|
||||
AddLabel(x + PrevLabelOffsetX, y + PrevLabelOffsetY, TextHue, "Previous");
|
||||
}
|
||||
|
||||
AddPage( 0 );
|
||||
x += PrevWidth + OffsetSize;
|
||||
|
||||
AddBackground( 0, 0, BackWidth, BorderSize + totalHeight + BorderSize, BackGumpID );
|
||||
AddImageTiled( BorderSize, BorderSize, TotalWidth - (OldStyle ? SetWidth + OffsetSize : 0), totalHeight, OffsetGumpID );
|
||||
int emptyWidth = TotalWidth - PrevWidth * 2 - NextWidth - OffsetSize * 5 -
|
||||
(OldStyle ? SetWidth + OffsetSize : 0);
|
||||
|
||||
if ( OldStyle )
|
||||
AddImageTiled( x, y, TotalWidth - (OffsetSize * 3) - SetWidth, EntryHeight, HeaderGumpID );
|
||||
else
|
||||
AddImageTiled( x, y, PrevWidth, EntryHeight, HeaderGumpID );
|
||||
if (!OldStyle)
|
||||
AddImageTiled(x - (OldStyle ? OffsetSize : 0), y, emptyWidth + (OldStyle ? OffsetSize * 2 : 0), EntryHeight,
|
||||
EntryGumpID);
|
||||
|
||||
if ( node.Parent != null )
|
||||
{
|
||||
AddButton( x + PrevOffsetX, y + PrevOffsetY, PrevButtonID1, PrevButtonID2, 1, GumpButtonType.Reply, 0 );
|
||||
AddHtml(x + TextOffsetX, y, emptyWidth - TextOffsetX, EntryHeight, $"<center>{node.Name}</center>", false,
|
||||
false);
|
||||
|
||||
if ( PrevLabel )
|
||||
AddLabel( x + PrevLabelOffsetX, y + PrevLabelOffsetY, TextHue, "Previous" );
|
||||
}
|
||||
x += emptyWidth + OffsetSize;
|
||||
|
||||
x += PrevWidth + OffsetSize;
|
||||
if (OldStyle)
|
||||
AddImageTiled(x, y, TotalWidth - OffsetSize * 3 - SetWidth, EntryHeight, HeaderGumpID);
|
||||
else
|
||||
AddImageTiled(x, y, PrevWidth, EntryHeight, HeaderGumpID);
|
||||
|
||||
int emptyWidth = TotalWidth - (PrevWidth * 2) - NextWidth - (OffsetSize * 5) - (OldStyle ? SetWidth + OffsetSize : 0);
|
||||
if (page > 0)
|
||||
{
|
||||
AddButton(x + PrevOffsetX, y + PrevOffsetY, PrevButtonID1, PrevButtonID2, 2, GumpButtonType.Reply, 0);
|
||||
|
||||
if ( !OldStyle )
|
||||
AddImageTiled( x - (OldStyle ? OffsetSize : 0), y, emptyWidth + (OldStyle ? OffsetSize * 2 : 0), EntryHeight, EntryGumpID );
|
||||
if (PrevLabel)
|
||||
AddLabel(x + PrevLabelOffsetX, y + PrevLabelOffsetY, TextHue, "Previous");
|
||||
}
|
||||
|
||||
AddHtml( x + TextOffsetX, y, emptyWidth - TextOffsetX, EntryHeight, $"<center>{node.Name}</center>", false, false );
|
||||
x += PrevWidth + OffsetSize;
|
||||
|
||||
x += emptyWidth + OffsetSize;
|
||||
if (!OldStyle)
|
||||
AddImageTiled(x, y, NextWidth, EntryHeight, HeaderGumpID);
|
||||
|
||||
if ( OldStyle )
|
||||
AddImageTiled( x, y, TotalWidth - (OffsetSize * 3) - SetWidth, EntryHeight, HeaderGumpID );
|
||||
else
|
||||
AddImageTiled( x, y, PrevWidth, EntryHeight, HeaderGumpID );
|
||||
if ((page + 1) * EntryCount < node.Children.Length)
|
||||
{
|
||||
AddButton(x + NextOffsetX, y + NextOffsetY, NextButtonID1, NextButtonID2, 3, GumpButtonType.Reply, 1);
|
||||
|
||||
if ( page > 0 )
|
||||
{
|
||||
AddButton( x + PrevOffsetX, y + PrevOffsetY, PrevButtonID1, PrevButtonID2, 2, GumpButtonType.Reply, 0 );
|
||||
if (NextLabel)
|
||||
AddLabel(x + NextLabelOffsetX, y + NextLabelOffsetY, TextHue, "Next");
|
||||
}
|
||||
|
||||
if ( PrevLabel )
|
||||
AddLabel( x + PrevLabelOffsetX, y + PrevLabelOffsetY, TextHue, "Previous" );
|
||||
}
|
||||
for (int i = 0, index = page * EntryCount; i < EntryCount && index < node.Children.Length; ++i, ++index)
|
||||
{
|
||||
x = BorderSize + OffsetSize;
|
||||
y += EntryHeight + OffsetSize;
|
||||
|
||||
x += PrevWidth + OffsetSize;
|
||||
object child = node.Children[index];
|
||||
string name = "";
|
||||
|
||||
if ( !OldStyle )
|
||||
AddImageTiled( x, y, NextWidth, EntryHeight, HeaderGumpID );
|
||||
if (child is ParentNode parentNode)
|
||||
name = parentNode.Name;
|
||||
else if (child is ChildNode childNode)
|
||||
name = childNode.Name;
|
||||
|
||||
if ( (page + 1) * EntryCount < node.Children.Length )
|
||||
{
|
||||
AddButton( x + NextOffsetX, y + NextOffsetY, NextButtonID1, NextButtonID2, 3, GumpButtonType.Reply, 1 );
|
||||
AddImageTiled(x, y, EntryWidth, EntryHeight, EntryGumpID);
|
||||
AddLabelCropped(x + TextOffsetX, y, EntryWidth - TextOffsetX, EntryHeight, TextHue, name);
|
||||
|
||||
if ( NextLabel )
|
||||
AddLabel( x + NextLabelOffsetX, y + NextLabelOffsetY, TextHue, "Next" );
|
||||
}
|
||||
x += EntryWidth + OffsetSize;
|
||||
|
||||
for ( int i = 0, index = page * EntryCount; i < EntryCount && index < node.Children.Length; ++i, ++index )
|
||||
{
|
||||
x = BorderSize + OffsetSize;
|
||||
y += EntryHeight + OffsetSize;
|
||||
if (SetGumpID != 0)
|
||||
AddImageTiled(x, y, SetWidth, EntryHeight, SetGumpID);
|
||||
|
||||
object child = node.Children[index];
|
||||
string name = "";
|
||||
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, index + 4, GumpButtonType.Reply, 0);
|
||||
}
|
||||
}
|
||||
|
||||
if ( child is ParentNode parentNode )
|
||||
name = parentNode.Name;
|
||||
else if ( child is ChildNode childNode )
|
||||
name = childNode.Name;
|
||||
public static void DisplayTo(Mobile from)
|
||||
{
|
||||
LocationTree tree;
|
||||
|
||||
AddImageTiled( x, y, EntryWidth, EntryHeight, EntryGumpID );
|
||||
AddLabelCropped( x + TextOffsetX, y, EntryWidth - TextOffsetX, EntryHeight, TextHue, name );
|
||||
if (from.Map == Map.Ilshenar)
|
||||
tree = Ilshenar;
|
||||
else if (from.Map == Map.Felucca)
|
||||
tree = Felucca;
|
||||
else if (from.Map == Map.Trammel)
|
||||
tree = Trammel;
|
||||
else if (from.Map == Map.Malas)
|
||||
tree = Malas;
|
||||
else
|
||||
tree = Tokuno;
|
||||
|
||||
x += EntryWidth + OffsetSize;
|
||||
tree.LastBranch.TryGetValue(from, out ParentNode branch);
|
||||
|
||||
if ( SetGumpID != 0 )
|
||||
AddImageTiled( x, y, SetWidth, EntryHeight, SetGumpID );
|
||||
if (branch == null)
|
||||
branch = tree.Root;
|
||||
|
||||
AddButton( x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, index + 4, GumpButtonType.Reply, 0 );
|
||||
}
|
||||
}
|
||||
if (branch != null)
|
||||
from.SendGump(new GoGump(0, from, tree, branch));
|
||||
}
|
||||
|
||||
public override void OnResponse( NetState state, RelayInfo info )
|
||||
{
|
||||
Mobile from = state.Mobile;
|
||||
public override void OnResponse(NetState state, RelayInfo info)
|
||||
{
|
||||
Mobile from = state.Mobile;
|
||||
|
||||
switch ( info.ButtonID )
|
||||
{
|
||||
case 1:
|
||||
{
|
||||
if ( m_Node.Parent != null )
|
||||
from.SendGump( new GoGump( 0, from, m_Tree, m_Node.Parent ) );
|
||||
switch (info.ButtonID)
|
||||
{
|
||||
case 1:
|
||||
{
|
||||
if (m_Node.Parent != null)
|
||||
from.SendGump(new GoGump(0, from, m_Tree, m_Node.Parent));
|
||||
|
||||
break;
|
||||
}
|
||||
case 2:
|
||||
{
|
||||
if ( m_Page > 0 )
|
||||
from.SendGump( new GoGump( m_Page - 1, from, m_Tree, m_Node ) );
|
||||
break;
|
||||
}
|
||||
case 2:
|
||||
{
|
||||
if (m_Page > 0)
|
||||
from.SendGump(new GoGump(m_Page - 1, from, m_Tree, m_Node));
|
||||
|
||||
break;
|
||||
}
|
||||
case 3:
|
||||
{
|
||||
if ( (m_Page + 1) * EntryCount < m_Node.Children.Length )
|
||||
from.SendGump( new GoGump( m_Page + 1, from, m_Tree, m_Node ) );
|
||||
break;
|
||||
}
|
||||
case 3:
|
||||
{
|
||||
if ((m_Page + 1) * EntryCount < m_Node.Children.Length)
|
||||
from.SendGump(new GoGump(m_Page + 1, from, m_Tree, m_Node));
|
||||
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
int index = info.ButtonID - 4;
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
int index = info.ButtonID - 4;
|
||||
|
||||
if ( index >= 0 && index < m_Node.Children.Length )
|
||||
{
|
||||
object o = m_Node.Children[index];
|
||||
if (index >= 0 && index < m_Node.Children.Length)
|
||||
{
|
||||
object o = m_Node.Children[index];
|
||||
|
||||
if ( o is ParentNode node )
|
||||
from.SendGump( new GoGump( 0, from, m_Tree, node ) );
|
||||
else
|
||||
from.MoveToWorld(((ChildNode)o).Location, m_Tree.Map );
|
||||
}
|
||||
if (o is ParentNode node)
|
||||
from.SendGump(new GoGump(0, from, m_Tree, node));
|
||||
else
|
||||
from.MoveToWorld(((ChildNode)o).Location, m_Tree.Map);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -4,40 +4,40 @@ using System.Xml;
|
|||
|
||||
namespace Server.Gumps
|
||||
{
|
||||
public class LocationTree
|
||||
{
|
||||
public LocationTree( string fileName, Map map )
|
||||
{
|
||||
LastBranch = new Dictionary<Mobile, ParentNode>();
|
||||
Map = map;
|
||||
public class LocationTree
|
||||
{
|
||||
public LocationTree(string fileName, Map map)
|
||||
{
|
||||
LastBranch = new Dictionary<Mobile, ParentNode>();
|
||||
Map = map;
|
||||
|
||||
string path = Path.Combine( "Data/Locations/", fileName );
|
||||
string path = Path.Combine("Data/Locations/", fileName);
|
||||
|
||||
if ( File.Exists( path ) )
|
||||
{
|
||||
XmlTextReader xml = new XmlTextReader( new StreamReader( path ) );
|
||||
if (File.Exists(path))
|
||||
{
|
||||
XmlTextReader xml = new XmlTextReader(new StreamReader(path));
|
||||
|
||||
xml.WhitespaceHandling = WhitespaceHandling.None;
|
||||
xml.WhitespaceHandling = WhitespaceHandling.None;
|
||||
|
||||
Root = Parse( xml );
|
||||
Root = Parse(xml);
|
||||
|
||||
xml.Close();
|
||||
}
|
||||
}
|
||||
xml.Close();
|
||||
}
|
||||
}
|
||||
|
||||
public Dictionary<Mobile, ParentNode> LastBranch { get; }
|
||||
public Dictionary<Mobile, ParentNode> LastBranch{ get; }
|
||||
|
||||
public Map Map { get; }
|
||||
public Map Map{ get; }
|
||||
|
||||
public ParentNode Root { get; }
|
||||
public ParentNode Root{ get; }
|
||||
|
||||
private ParentNode Parse( XmlTextReader xml )
|
||||
{
|
||||
xml.Read();
|
||||
xml.Read();
|
||||
xml.Read();
|
||||
private ParentNode Parse(XmlTextReader xml)
|
||||
{
|
||||
xml.Read();
|
||||
xml.Read();
|
||||
xml.Read();
|
||||
|
||||
return new ParentNode( xml, null );
|
||||
}
|
||||
}
|
||||
return new ParentNode(xml, null);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,57 +1,57 @@
|
|||
using System.Xml;
|
||||
using System.Collections;
|
||||
using System.Xml;
|
||||
|
||||
namespace Server.Gumps
|
||||
{
|
||||
public class ParentNode
|
||||
{
|
||||
public ParentNode( XmlTextReader xml, ParentNode parent )
|
||||
{
|
||||
Parent = parent;
|
||||
public class ParentNode
|
||||
{
|
||||
public ParentNode(XmlTextReader xml, ParentNode parent)
|
||||
{
|
||||
Parent = parent;
|
||||
|
||||
Parse( xml );
|
||||
}
|
||||
Parse(xml);
|
||||
}
|
||||
|
||||
private void Parse( XmlTextReader xml )
|
||||
{
|
||||
if ( xml.MoveToAttribute( "name" ) )
|
||||
Name = xml.Value;
|
||||
else
|
||||
Name = "empty";
|
||||
public ParentNode Parent{ get; }
|
||||
|
||||
if ( xml.IsEmptyElement )
|
||||
{
|
||||
Children = new object[0];
|
||||
}
|
||||
else
|
||||
{
|
||||
ArrayList children = new ArrayList();
|
||||
public object[] Children{ get; private set; }
|
||||
|
||||
while ( xml.Read() && ( xml.NodeType == XmlNodeType.Element || xml.NodeType == XmlNodeType.Comment ) )
|
||||
{
|
||||
if ( xml.NodeType == XmlNodeType.Comment )
|
||||
continue;
|
||||
public string Name{ get; private set; }
|
||||
|
||||
if ( xml.Name == "child" )
|
||||
{
|
||||
ChildNode n = new ChildNode( xml, this );
|
||||
private void Parse(XmlTextReader xml)
|
||||
{
|
||||
if (xml.MoveToAttribute("name"))
|
||||
Name = xml.Value;
|
||||
else
|
||||
Name = "empty";
|
||||
|
||||
children.Add( n );
|
||||
}
|
||||
else
|
||||
{
|
||||
children.Add( new ParentNode( xml, this ) );
|
||||
}
|
||||
}
|
||||
if (xml.IsEmptyElement)
|
||||
{
|
||||
Children = new object[0];
|
||||
}
|
||||
else
|
||||
{
|
||||
ArrayList children = new ArrayList();
|
||||
|
||||
Children = children.ToArray();
|
||||
}
|
||||
}
|
||||
while (xml.Read() && (xml.NodeType == XmlNodeType.Element || xml.NodeType == XmlNodeType.Comment))
|
||||
{
|
||||
if (xml.NodeType == XmlNodeType.Comment)
|
||||
continue;
|
||||
|
||||
public ParentNode Parent { get; }
|
||||
if (xml.Name == "child")
|
||||
{
|
||||
ChildNode n = new ChildNode(xml, this);
|
||||
|
||||
public object[] Children { get; private set; }
|
||||
children.Add(n);
|
||||
}
|
||||
else
|
||||
{
|
||||
children.Add(new ParentNode(xml, this));
|
||||
}
|
||||
}
|
||||
|
||||
public string Name { get; private set; }
|
||||
}
|
||||
Children = children.ToArray();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue