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

Code Cleanup & Fixes Warnings (#74)

Browse source
This commit is contained in:
Kamron Batman 2020-01-18 14:56:45 -08:00 • committed by GitHub
parent e11d1f3ad9
commit 57b14ad690
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
143 changed files with 2960 additions and 3427 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Projects/Scripts/Mobiles/Townfolk/TownCrier.cs
View file

@ -50,8 +50,7 @@ namespace Server.Mobiles
public TownCrierEntry AddEntry(string[] lines, TimeSpan duration)
{
if (Entries == null)
Entries = new List<TownCrierEntry>();
Entries ??= new List<TownCrierEntry>();
TownCrierEntry tce = new TownCrierEntry(lines, duration);
@ -204,10 +203,7 @@ namespace Server.Mobiles
owner.GetRandomEntry(); // force expiration checks
int count = 0;
if (entries != null)
count = entries.Count;
int count = entries?.Count ?? 0;
AddImageTiled(0, 0, 300, 38 + (count == 0 ? 20 : count * 85), 0xA40);
AddAlphaRegion(1, 1, 298, 36 + (count == 0 ? 20 : count * 85));
@ -384,15 +380,13 @@ namespace Server.Mobiles
public TownCrierEntry AddEntry(string[] lines, TimeSpan duration)
{
if (Entries == null)
Entries = new List<TownCrierEntry>();
Entries ??= new List<TownCrierEntry>();
TownCrierEntry tce = new TownCrierEntry(lines, duration);
Entries.Add(tce);
if (m_AutoShoutTimer == null)
m_AutoShoutTimer = Timer.DelayCall(TimeSpan.FromSeconds(5.0), TimeSpan.FromMinutes(1.0), AutoShout_Callback);
m_AutoShoutTimer ??= Timer.DelayCall(TimeSpan.FromSeconds(5.0), TimeSpan.FromMinutes(1.0), AutoShout_Callback);
return tce;
}
@ -417,8 +411,7 @@ namespace Server.Mobiles
public void ForceBeginAutoShout()
{
if (m_AutoShoutTimer == null)
m_AutoShoutTimer = Timer.DelayCall(TimeSpan.FromSeconds(5.0), TimeSpan.FromMinutes(1.0), AutoShout_Callback);
m_AutoShoutTimer ??= Timer.DelayCall(TimeSpan.FromSeconds(5.0), TimeSpan.FromMinutes(1.0), AutoShout_Callback);
}
private void AutoShout_Callback()
@ -433,9 +426,8 @@ namespace Server.Mobiles
}
else if (m_NewsTimer == null)
{
int index = 0;
m_NewsTimer = Timer.DelayCall(TimeSpan.FromSeconds(1.0), TimeSpan.FromSeconds(3.0),
() => ShoutNews_Callback(tce, index));
() => ShoutNews_Callback(tce, 0));
PublicOverheadMessage(MessageType.Regular, 0x3B2, 502976); // Hear ye! Hear ye!
}
@ -478,9 +470,8 @@ namespace Server.Mobiles
}
else
{
int index = 0;
m_NewsTimer = Timer.DelayCall(TimeSpan.FromSeconds(1.0), TimeSpan.FromSeconds(3.0),
() => ShoutNews_Callback(tce, index));
() => ShoutNews_Callback(tce, 0));
PublicOverheadMessage(MessageType.Regular, 0x3B2, 502978); // Some of the latest news!
}