From 3e715bcb6042b8def3695d42fdd2c6cee7e500d5 Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Sat, 25 Apr 2020 11:09:12 -0700 Subject: [PATCH] Fixes gumps (#112) --- Projects/Server/Gumps/Gump.cs | 2 +- Projects/Server/Gumps/GumpHtmlLocalized.cs | 51 +++++++++---------- Projects/Server/Gumps/GumpImageTiled.cs | 18 +++---- Projects/Server/Gumps/GumpTextEntryLimited.cs | 18 +++---- 4 files changed, 41 insertions(+), 48 deletions(-) diff --git a/Projects/Server/Gumps/Gump.cs b/Projects/Server/Gumps/Gump.cs index ca0b43cc2..17d121032 100644 --- a/Projects/Server/Gumps/Gump.cs +++ b/Projects/Server/Gumps/Gump.cs @@ -108,7 +108,7 @@ namespace Server.Gumps Add(new GumpGroup(group)); } - public void AddTooltip(int number, string args) + public void AddTooltip(int number, string args = null) { Add(new GumpTooltip(number, args)); } diff --git a/Projects/Server/Gumps/GumpHtmlLocalized.cs b/Projects/Server/Gumps/GumpHtmlLocalized.cs index 4f31b54b6..ae122fe7d 100644 --- a/Projects/Server/Gumps/GumpHtmlLocalized.cs +++ b/Projects/Server/Gumps/GumpHtmlLocalized.cs @@ -35,16 +35,13 @@ namespace Server.Gumps private static readonly byte[] m_LayoutNameColor = Gump.StringToBuffer("xmfhtmlgumpcolor"); private static readonly byte[] m_LayoutNameArgs = Gump.StringToBuffer("xmfhtmltok"); - private int m_Width, m_Height; - private int m_X, m_Y; - public GumpHtmlLocalized(int x, int y, int width, int height, int number, bool background = false, bool scrollbar = false) { - m_X = x; - m_Y = y; - m_Width = width; - m_Height = height; + X = x; + Y = y; + Width = width; + Height = height; Number = number; Background = background; Scrollbar = scrollbar; @@ -55,10 +52,10 @@ namespace Server.Gumps public GumpHtmlLocalized(int x, int y, int width, int height, int number, int color, bool background = false, bool scrollbar = false) { - m_X = x; - m_Y = y; - m_Width = width; - m_Height = height; + X = x; + Y = y; + Width = width; + Height = height; Number = number; Color = color; Background = background; @@ -72,10 +69,10 @@ namespace Server.Gumps { // Are multiple arguments unsupported? And what about non ASCII arguments? - m_X = x; - m_Y = y; - m_Width = width; - m_Height = height; + X = x; + Y = y; + Width = width; + Height = height; Number = number; Args = args; Color = color; @@ -126,10 +123,10 @@ namespace Server.Gumps { disp.AppendLayout(m_LayoutNamePlain); - disp.AppendLayout(m_X); - disp.AppendLayout(m_Y); - disp.AppendLayout(m_Width); - disp.AppendLayout(m_Height); + disp.AppendLayout(X); + disp.AppendLayout(Y); + disp.AppendLayout(Width); + disp.AppendLayout(Height); disp.AppendLayout(Number); disp.AppendLayout(Background); disp.AppendLayout(Scrollbar); @@ -141,10 +138,10 @@ namespace Server.Gumps { disp.AppendLayout(m_LayoutNameColor); - disp.AppendLayout(m_X); - disp.AppendLayout(m_Y); - disp.AppendLayout(m_Width); - disp.AppendLayout(m_Height); + disp.AppendLayout(X); + disp.AppendLayout(Y); + disp.AppendLayout(Width); + disp.AppendLayout(Height); disp.AppendLayout(Number); disp.AppendLayout(Background); disp.AppendLayout(Scrollbar); @@ -157,10 +154,10 @@ namespace Server.Gumps { disp.AppendLayout(m_LayoutNameArgs); - disp.AppendLayout(m_X); - disp.AppendLayout(m_Y); - disp.AppendLayout(m_Width); - disp.AppendLayout(m_Height); + disp.AppendLayout(X); + disp.AppendLayout(Y); + disp.AppendLayout(Width); + disp.AppendLayout(Height); disp.AppendLayout(Background); disp.AppendLayout(Scrollbar); disp.AppendLayout(Color); diff --git a/Projects/Server/Gumps/GumpImageTiled.cs b/Projects/Server/Gumps/GumpImageTiled.cs index aa373fb0a..ac16248f6 100644 --- a/Projects/Server/Gumps/GumpImageTiled.cs +++ b/Projects/Server/Gumps/GumpImageTiled.cs @@ -25,15 +25,13 @@ namespace Server.Gumps public class GumpImageTiled : GumpEntry { private static readonly byte[] m_LayoutName = Gump.StringToBuffer("gumppictiled"); - private int m_Width, m_Height; - private int m_X, m_Y; public GumpImageTiled(int x, int y, int width, int height, int gumpID) { - m_X = x; - m_Y = y; - m_Width = width; - m_Height = height; + X = x; + Y = y; + Width = width; + Height = height; GumpID = gumpID; } @@ -52,10 +50,10 @@ namespace Server.Gumps public override void AppendTo(NetState ns, IGumpWriter disp) { disp.AppendLayout(m_LayoutName); - disp.AppendLayout(m_X); - disp.AppendLayout(m_Y); - disp.AppendLayout(m_Width); - disp.AppendLayout(m_Height); + disp.AppendLayout(X); + disp.AppendLayout(Y); + disp.AppendLayout(Width); + disp.AppendLayout(Height); disp.AppendLayout(GumpID); } } diff --git a/Projects/Server/Gumps/GumpTextEntryLimited.cs b/Projects/Server/Gumps/GumpTextEntryLimited.cs index 7fba3d4a0..077cc2b31 100644 --- a/Projects/Server/Gumps/GumpTextEntryLimited.cs +++ b/Projects/Server/Gumps/GumpTextEntryLimited.cs @@ -25,15 +25,13 @@ namespace Server.Gumps public class GumpTextEntryLimited : GumpEntry { private static readonly byte[] m_LayoutName = Gump.StringToBuffer("textentrylimited"); - private int m_Width, m_Height; - private int m_X, m_Y; public GumpTextEntryLimited(int x, int y, int width, int height, int hue, int entryID, string initialText, int size = 0) { - m_X = x; - m_Y = y; - m_Width = width; - m_Height = height; + X = x; + Y = y; + Width = width; + Height = height; Hue = hue; EntryID = entryID; InitialText = initialText; @@ -62,10 +60,10 @@ namespace Server.Gumps public override void AppendTo(NetState ns, IGumpWriter disp) { disp.AppendLayout(m_LayoutName); - disp.AppendLayout(m_X); - disp.AppendLayout(m_Y); - disp.AppendLayout(m_Width); - disp.AppendLayout(m_Height); + disp.AppendLayout(X); + disp.AppendLayout(Y); + disp.AppendLayout(Width); + disp.AppendLayout(Height); disp.AppendLayout(Hue); disp.AppendLayout(EntryID); disp.AppendLayout(Parent.Intern(InitialText));