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

Code cleanup (#188)

Browse source
This commit is contained in:
Kamron Batman 2020-08-01 08:40:06 -07:00 • committed by GitHub
parent df53c16620
commit 010fd9402a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
185 changed files with 1052 additions and 1271 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Projects/UOContent/Gumps/Go/GoGump.cs
View file

@ -1,3 +1,4 @@
using System;
using Server.Network;
namespace Server.Gumps
@ -107,12 +108,7 @@ namespace Server.Gumps
int x = BorderSize + OffsetSize;
int y = BorderSize + OffsetSize;
int count = node.Categories.Length + node.Locations.Length - page * EntryCount;
if (count < 0)
count = 0;
else if (count > EntryCount)
count = EntryCount;
int count = Math.Clamp(node.Categories.Length + node.Locations.Length - page * EntryCount, 0, EntryCount);
int totalHeight = OffsetSize + (EntryHeight + OffsetSize) * (count + 1);

2
Projects/UOContent/Gumps/Guilds/New Guild System/BaseGuildListGump.cs
View file

@ -49,7 +49,7 @@ namespace Server.Guilds
}
m_List.Sort(m_Comparer);
m_StartNumber = Math.Max(Math.Min(m_StartNumber, m_List.Count - 1), 0);
m_StartNumber = Math.Clamp(m_StartNumber, 0, m_List.Count - 1);
AddBackground(130, 75, 385, 30, 0xBB8);
AddTextEntry(135, 80, 375, 30, 0x481, 1, m_Filter);

8
Projects/UOContent/Gumps/Guilds/New Guild System/War Declaration gump.cs
View file

@ -83,11 +83,9 @@ namespace Server.Guilds
TextRelay tWarLength = info.GetTextEntry(10);
int maxKills = tKills == null
? 0
: Math.Max(Math.Min(Utility.ToInt32(info.GetTextEntry(11).Text), 0xFFFF), 0);
TimeSpan warLength = TimeSpan.FromHours(tWarLength == null
? 0
: Math.Max(Math.Min(Utility.ToInt32(info.GetTextEntry(10).Text), 0xFFFF), 0));
? 0 : Math.Clamp(Utility.ToInt32(info.GetTextEntry(11).Text), 0, 0xFFFF);
TimeSpan warLength = TimeSpan.FromHours(tWarLength == null ? 0
: Math.Clamp(Utility.ToInt32(info.GetTextEntry(10).Text), 0, 0xFFFF));
if (war != null)
{

4
Projects/UOContent/Gumps/PolymorphGump.cs
View file

@ -30,8 +30,8 @@ namespace Server.Gumps
ArtID = art;
BodyID = body;
LocNumber = locNum;
this.X = x;
this.Y = y;
X = x;
Y = y;
}
public int ArtID { get; }

7
Projects/UOContent/Gumps/Props/PropsGump.cs
View file

@ -180,12 +180,7 @@ namespace Server.Gumps
{
m_Page = page;
int count = m_List.Count - page * EntryCount;
if (count < 0)
count = 0;
else if (count > EntryCount)
count = EntryCount;
int count = Math.Clamp(m_List.Count - page * EntryCount, 0, EntryCount);
int lastIndex = page * EntryCount + count - 1;

2
Projects/UOContent/Gumps/ReportMurderer.cs
View file

@ -144,7 +144,7 @@ namespace Server.Gumps
if (Core.SE)
{
from.RecentlyReported.Add(killer);
Timer.DelayCall(TimeSpan.FromMinutes(10), () => ReportedListExpiry_Callback(from, killer));
Timer.DelayCall(TimeSpan.FromMinutes(10), ReportedListExpiry_Callback, from, killer);
}
if (killer is PlayerMobile pk)