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

24
Scripts/Engines/Help/StuckMenu.cs
View file

@ -125,7 +125,7 @@ namespace Server.Menus.Questions
AddBackground(0, 0, 270, 320, 2600);
AddHtmlLocalized(50, 20, 250, 35, 1011027, false, false); // Chose a town:
AddHtmlLocalized(50, 20, 250, 35, 1011027); // Chose a town:
StuckMenuEntry[] entries = IsInSecondAgeArea(beheld) ? m_T2AEntries : m_Entries;
@ -133,26 +133,18 @@ namespace Server.Menus.Questions
{
StuckMenuEntry entry = entries[i];
AddButton(50, 55 + 35 * i, 208, 209, i + 1, GumpButtonType.Reply, 0);
AddHtmlLocalized(75, 55 + 35 * i, 335, 40, entry.Name, false, false);
AddButton(50, 55 + 35 * i, 208, 209, i + 1);
AddHtmlLocalized(75, 55 + 35 * i, 335, 40, entry.Name);
}
AddButton(55, 263, 4005, 4007, 0, GumpButtonType.Reply, 0);
AddHtmlLocalized(90, 265, 200, 35, 1011012, false, false); // CANCEL
AddButton(55, 263, 4005, 4007, 0);
AddHtmlLocalized(90, 265, 200, 35, 1011012); // CANCEL
}
private static bool IsInSecondAgeArea(Mobile m)
{
if (m.Map != Map.Trammel && m.Map != Map.Felucca)
return false;
if (m.X >= 5120 && m.Y >= 2304)
return true;
if (m.Region.IsPartOf("Terathan Keep"))
return true;
return false;
return (m.Map == Map.Trammel || m.Map == Map.Felucca) &&
(m.X >= 5120 && m.Y >= 2304 || m.Region.IsPartOf("Terathan Keep"));
}
public void BeginClose()
@ -289,4 +281,4 @@ namespace Server.Menus.Questions
}
}
}
}
}