warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Modernization Fixes & Updates to Default Values (#3)

Browse source
This commit is contained in:
Kamron Batman 2018-10-28 00:33:16 -07:00 • committed by GitHub
parent 445eddff68
commit dcf64091b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
768 changed files with 10507 additions and 14196 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Server/Gumps/Gump.cs
View file

@ -27,7 +27,7 @@ namespace Server.Gumps
{
public class Gump
{
private static int m_NextSerial = 1;
private static uint m_NextSerial = 1;
private static byte[] m_BeginLayout = StringToBuffer("{ ");
private static byte[] m_EndLayout = StringToBuffer(" }");
@ -39,10 +39,10 @@ namespace Server.Gumps
private bool m_Closable = true;
private bool m_Disposable = true;
private bool m_Dragable = true;
private bool m_Draggable = true;
private bool m_Resizable = true;
private int m_Serial;
private uint m_Serial;
private List<string> m_Strings;
internal int m_TextEntries, m_Switches;
@ -68,7 +68,7 @@ namespace Server.Gumps
public List<GumpEntry> Entries{ get; }
public int Serial
public uint Serial
{
get => m_Serial;
set
@ -133,14 +133,14 @@ namespace Server.Gumps
}
}
public bool Dragable
public bool Draggable
{
get => m_Dragable;
get => m_Draggable;
set
{
if (m_Dragable != value)
if (m_Draggable != value)
{
m_Dragable = value;
m_Draggable = value;
Invalidate();
}
}
@ -161,7 +161,7 @@ namespace Server.Gumps
public static int GetTypeID(Type type)
{
return type.FullName.GetHashCode();
return type?.FullName?.GetHashCode() ?? -1;
}
public void Invalidate()
@ -290,7 +290,7 @@ namespace Server.Gumps
Add(new GumpTextEntryLimited(x, y, width, height, hue, entryID, initialText, size));
}
public void AddItemProperty(int serial)
public void AddItemProperty(uint serial)
{
Add(new GumpItemProperty(serial));
}
@ -349,7 +349,7 @@ namespace Server.Gumps
else
disp = new DisplayGumpFast(this);
if (!m_Dragable)
if (!m_Draggable)
disp.AppendLayout(m_NoMove);
if (!m_Closable)
@ -379,7 +379,7 @@ namespace Server.Gumps
m_TextEntries = disp.TextEntries;
m_Switches = disp.Switches;
return disp as Packet;
return (Packet)disp;
}
public virtual void OnResponse(NetState sender, RelayInfo info)

5
Server/Gumps/GumpEntry.cs
View file

@ -41,6 +41,11 @@ namespace Server.Gumps
}
}
}
protected void Delta(ref uint var, uint val)
{
if (var != val) var = val;
}
protected void Delta(ref int var, int val)
{

6
Server/Gumps/GumpItemProperty.cs
View file

@ -25,14 +25,14 @@ namespace Server.Gumps
public class GumpItemProperty : GumpEntry
{
private static byte[] m_LayoutName = Gump.StringToBuffer("itemproperty");
private int m_Serial;
private uint m_Serial;
public GumpItemProperty(int serial)
public GumpItemProperty(uint serial)
{
m_Serial = serial;
}
public int Serial
public uint Serial
{
get => m_Serial;
set => Delta(ref m_Serial, value);