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

Clean up: Bugs, LINQ, constructors, default values, and null checks (#18)

Browse source
This commit is contained in:
Kamron Batman 2019-03-11 14:29:59 -07:00 • committed by GitHub
parent e748af4430
commit 513e54f70e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1094 changed files with 15913 additions and 21892 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Scripts/Gumps/Props/PropsGump.cs
View file

@ -213,7 +213,7 @@ namespace Server.Gumps
if (page > 0)
{
AddButton(x + PrevOffsetX, y + PrevOffsetY, PrevButtonID1, PrevButtonID2, 1, GumpButtonType.Reply, 0);
AddButton(x + PrevOffsetX, y + PrevOffsetY, PrevButtonID1, PrevButtonID2, 1);
if (PrevLabel)
AddLabel(x + PrevLabelOffsetX, y + PrevLabelOffsetY, TextHue, "Previous");
@ -226,7 +226,7 @@ namespace Server.Gumps
if (TypeLabel && m_Type != null)
AddHtml(x, y, emptyWidth, EntryHeight,
$"<BASEFONT COLOR=#FAFAFA><CENTER>{m_Type.Name}</CENTER></BASEFONT>", false, false);
$"<BASEFONT COLOR=#FAFAFA><CENTER>{m_Type.Name}</CENTER></BASEFONT>");
x += emptyWidth + OffsetSize;
@ -276,8 +276,7 @@ namespace Server.Gumps
CPA cpa = GetCPA(prop);
if (prop.CanWrite && cpa != null && m_Mobile.AccessLevel >= cpa.WriteLevel && !cpa.ReadOnly)
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, i + 3, GumpButtonType.Reply,
0);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, i + 3);
}
}
}
@ -296,10 +295,9 @@ namespace Server.Gumps
{
case 0: // Closed
{
if (m_Stack != null && m_Stack.Count > 0)
if (m_Stack?.Count > 0)
{
StackEntry entry = m_Stack.Pop();
from.SendGump(new PropertiesGump(from, entry.m_Object, m_Stack, null));
}
@ -504,7 +502,7 @@ namespace Server.Gumps
}
if (o is byte || o is sbyte || o is short || o is ushort || o is int || o is uint || o is long || o is ulong)
return string.Format("{0} (0x{0:X})", o);
return $"{o} (0x{o:X})";
if (o is Mobile mobile) return $"(M) 0x{mobile.Serial.Value:X} \"{mobile.Name}\"";
if (o is Item item) return $"(I) 0x{item.Serial.Value:X}";
if (o is Type type) return type.Name;
@ -637,7 +635,7 @@ namespace Server.Gumps
}
if (o is byte || o is sbyte || o is short || o is ushort || o is int || o is uint || o is long || o is ulong)
return string.Format("{0} (0x{0:X})", o);
return $"{o} (0x{o:X})";
if (o is Mobile mobile) return $"(M) 0x{mobile.Serial.Value:X} \"{mobile.Name}\"";
if (o is Item item) return $"(I) 0x{item.Serial.Value:X}";
if (o is Type type) return type.Name;

22
Scripts/Gumps/Props/SetBodyGump.cs
View file

@ -76,23 +76,23 @@ namespace Server.Gumps
int y = 40 + i / 4 * 93;
AddItem(x + (120 - bounds.Width) / 2 - bounds.X, y + (69 - bounds.Height) / 2 - bounds.Y, itemID);
AddButton(x + 6, y + 66, 0x98D, 0x98D, 7 + index, GumpButtonType.Reply, 0);
AddButton(x + 6, y + 66, 0x98D, 0x98D, 7 + index);
x += 6;
y += 67;
AddHtml(x + 0, y - 1, 108, 21, Center(entry.DisplayName), false, false);
AddHtml(x + 0, y + 1, 108, 21, Center(entry.DisplayName), false, false);
AddHtml(x - 1, y + 0, 108, 21, Center(entry.DisplayName), false, false);
AddHtml(x + 1, y + 0, 108, 21, Center(entry.DisplayName), false, false);
AddHtml(x + 0, y + 0, 108, 21, Color(Center(entry.DisplayName), TextColor32), false, false);
AddHtml(x + 0, y - 1, 108, 21, Center(entry.DisplayName));
AddHtml(x + 0, y + 1, 108, 21, Center(entry.DisplayName));
AddHtml(x - 1, y + 0, 108, 21, Center(entry.DisplayName));
AddHtml(x + 1, y + 0, 108, 21, Center(entry.DisplayName));
AddHtml(x + 0, y + 0, 108, 21, Color(Center(entry.DisplayName), TextColor32));
}
if (ourPage > 0)
AddButton(480, 12, 0x15E3, 0x15E7, 5, GumpButtonType.Reply, 0);
AddButton(480, 12, 0x15E3, 0x15E7, 5);
if ((ourPage + 1) * 12 < ourList.Count)
AddButton(497, 12, 0x15E1, 0x15E5, 6, GumpButtonType.Reply, 0);
AddButton(497, 12, 0x15E1, 0x15E5, 6);
}
}
@ -110,8 +110,8 @@ namespace Server.Gumps
{
bool isSelection = m_OurType == type;
AddButton(x, y - 1, isSelection ? 4006 : 4005, 4007, buttonID, GumpButtonType.Reply, 0);
AddHtml(x + 35, y, 200, 20, Color(text, isSelection ? SelectedColor32 : LabelColor32), false, false);
AddButton(x, y - 1, isSelection ? 4006 : 4005, 4007, buttonID);
AddHtml(x + 35, y, 200, 20, Color(text, isSelection ? SelectedColor32 : LabelColor32));
}
public override void OnResponse(NetState sender, RelayInfo info)
@ -299,4 +299,4 @@ namespace Server.Gumps
}
}
}
}
}

10
Scripts/Gumps/Props/SetGump.cs
View file

@ -109,7 +109,7 @@ namespace Server.Gumps
if (SetGumpID != 0)
AddImageTiled(x, y, SetWidth, EntryHeight, SetGumpID);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 1, GumpButtonType.Reply, 0);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 1);
if (canNull)
{
@ -123,7 +123,7 @@ namespace Server.Gumps
if (SetGumpID != 0)
AddImageTiled(x, y, SetWidth, EntryHeight, SetGumpID);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 2, GumpButtonType.Reply, 0);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 2);
}
if (canDye)
@ -138,7 +138,7 @@ namespace Server.Gumps
if (SetGumpID != 0)
AddImageTiled(x, y, SetWidth, EntryHeight, SetGumpID);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 3, GumpButtonType.Reply, 0);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 3);
}
if (isBody)
@ -153,7 +153,7 @@ namespace Server.Gumps
if (SetGumpID != 0)
AddImageTiled(x, y, SetWidth, EntryHeight, SetGumpID);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 4, GumpButtonType.Reply, 0);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 4);
}
}
@ -280,4 +280,4 @@ namespace Server.Gumps
}
}
}
}
}

4
Scripts/Gumps/Props/SetListOptionGump.cs
View file

@ -156,7 +156,7 @@ namespace Server.Gumps
AddImageTiled(x, y, SetWidth, EntryHeight, SetGumpID);
if (button != 0)
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, button, GumpButtonType.Reply, 0);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, button);
}
public override void OnResponse(NetState sender, RelayInfo info)
@ -184,4 +184,4 @@ namespace Server.Gumps
m_Mobile.SendGump(new PropertiesGump(m_Mobile, m_Object, m_Stack, m_List, m_Page));
}
}
}
}

10
Scripts/Gumps/Props/SetObjectGump.cs
View file

@ -98,7 +98,7 @@ namespace Server.Gumps
if (SetGumpID != 0)
AddImageTiled(x, y, SetWidth, EntryHeight, SetGumpID);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 1, GumpButtonType.Reply, 0);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 1);
x = BorderSize + OffsetSize;
y += EntryHeight + OffsetSize;
@ -110,7 +110,7 @@ namespace Server.Gumps
if (SetGumpID != 0)
AddImageTiled(x, y, SetWidth, EntryHeight, SetGumpID);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 2, GumpButtonType.Reply, 0);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 2);
x = BorderSize + OffsetSize;
y += EntryHeight + OffsetSize;
@ -122,7 +122,7 @@ namespace Server.Gumps
if (SetGumpID != 0)
AddImageTiled(x, y, SetWidth, EntryHeight, SetGumpID);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 3, GumpButtonType.Reply, 0);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 3);
x = BorderSize + OffsetSize;
y += EntryHeight + OffsetSize;
@ -134,7 +134,7 @@ namespace Server.Gumps
if (SetGumpID != 0)
AddImageTiled(x, y, SetWidth, EntryHeight, SetGumpID);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 4, GumpButtonType.Reply, 0);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 4);
}
public override void OnResponse(NetState sender, RelayInfo info)
@ -269,4 +269,4 @@ namespace Server.Gumps
}
}
}
}
}

8
Scripts/Gumps/Props/SetPoint2DGump.cs
View file

@ -94,7 +94,7 @@ namespace Server.Gumps
if (SetGumpID != 0)
AddImageTiled(x, y, SetWidth, EntryHeight, SetGumpID);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 1, GumpButtonType.Reply, 0);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 1);
x = BorderSize + OffsetSize;
y += EntryHeight + OffsetSize;
@ -105,7 +105,7 @@ namespace Server.Gumps
if (SetGumpID != 0)
AddImageTiled(x, y, SetWidth, EntryHeight, SetGumpID);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 2, GumpButtonType.Reply, 0);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 2);
x = BorderSize + OffsetSize;
y += EntryHeight + OffsetSize;
@ -122,7 +122,7 @@ namespace Server.Gumps
if (SetGumpID != 0)
AddImageTiled(x, y, SetWidth, EntryHeight, SetGumpID);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 3, GumpButtonType.Reply, 0);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 3);
}
public override void OnResponse(NetState sender, RelayInfo info)
@ -228,4 +228,4 @@ namespace Server.Gumps
}
}
}
}
}

8
Scripts/Gumps/Props/SetPoint3DGump.cs
View file

@ -94,7 +94,7 @@ namespace Server.Gumps
if (SetGumpID != 0)
AddImageTiled(x, y, SetWidth, EntryHeight, SetGumpID);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 1, GumpButtonType.Reply, 0);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 1);
x = BorderSize + OffsetSize;
y += EntryHeight + OffsetSize;
@ -105,7 +105,7 @@ namespace Server.Gumps
if (SetGumpID != 0)
AddImageTiled(x, y, SetWidth, EntryHeight, SetGumpID);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 2, GumpButtonType.Reply, 0);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 2);
x = BorderSize + OffsetSize;
y += EntryHeight + OffsetSize;
@ -127,7 +127,7 @@ namespace Server.Gumps
if (SetGumpID != 0)
AddImageTiled(x, y, SetWidth, EntryHeight, SetGumpID);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 3, GumpButtonType.Reply, 0);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, 3);
}
public override void OnResponse(NetState sender, RelayInfo info)
@ -235,4 +235,4 @@ namespace Server.Gumps
}
}
}
}
}

4
Scripts/Gumps/Props/SetTimeSpanGump.cs
View file

@ -100,7 +100,7 @@ namespace Server.Gumps
AddImageTiled(x, y, SetWidth, EntryHeight, SetGumpID);
if (button != 0)
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, button, GumpButtonType.Reply, 0);
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, button);
}
public override void OnResponse(NetState sender, RelayInfo info)
@ -226,4 +226,4 @@ namespace Server.Gumps
m_Mobile.SendGump(new PropertiesGump(m_Mobile, m_Object, m_Stack, m_List, m_Page));
}
}
}
}