feat: Moves gumps out of the core (#1916)
> [!Important] > **Developer Note** > This code change will **completely move gumps out of the core** ### Summary - Adds `GetGumps()` convenience which exposes methods to Find/Close/Send multiple gumps. This helper is a performance improvement by eliminating the Dictionary<Player, List> lookup for gumps.
This commit is contained in:
parent
40d99f6d1c
commit
8282b00ca2
246 changed files with 1722 additions and 1383 deletions
|
|
@ -189,10 +189,12 @@ namespace Server.Gumps
|
|||
|
||||
if (m_List.Count > 0)
|
||||
{
|
||||
from.CloseGump<HouseGump>();
|
||||
from.CloseGump<HouseListGump>();
|
||||
from.CloseGump<HouseRemoveGump>();
|
||||
from.SendGump(new HouseRemoveGump(m_Number, m_List, m_House, m_AccountOf));
|
||||
var gumps = from.GetGumps();
|
||||
|
||||
gumps.Close<HouseGump>();
|
||||
gumps.Close<HouseListGump>();
|
||||
gumps.Close<HouseRemoveGump>();
|
||||
gumps.Send(new HouseRemoveGump(m_Number, m_List, m_House, m_AccountOf));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
@ -206,6 +208,8 @@ namespace Server.Gumps
|
|||
{
|
||||
private readonly BaseHouse m_House;
|
||||
|
||||
public override bool Singleton => true;
|
||||
|
||||
public HouseGump(Mobile from, BaseHouse house) : base(20, 30)
|
||||
{
|
||||
if (house.Deleted)
|
||||
|
|
@ -215,9 +219,10 @@ namespace Server.Gumps
|
|||
|
||||
m_House = house;
|
||||
|
||||
from.CloseGump<HouseGump>();
|
||||
from.CloseGump<HouseListGump>();
|
||||
from.CloseGump<HouseRemoveGump>();
|
||||
var gumps = from.GetGumps();
|
||||
|
||||
gumps.Close<HouseListGump>();
|
||||
gumps.Close<HouseRemoveGump>();
|
||||
|
||||
var isCombatRestricted = house.IsCombatRestricted(from);
|
||||
|
||||
|
|
@ -453,6 +458,8 @@ namespace Server.Gumps
|
|||
return;
|
||||
}
|
||||
|
||||
var gumps = from.GetGumps();
|
||||
|
||||
switch (info.ButtonID)
|
||||
{
|
||||
case 1: // Rename sign
|
||||
|
|
@ -464,10 +471,10 @@ namespace Server.Gumps
|
|||
}
|
||||
case 2: // List of co-owners
|
||||
{
|
||||
from.CloseGump<HouseGump>();
|
||||
from.CloseGump<HouseListGump>();
|
||||
from.CloseGump<HouseRemoveGump>();
|
||||
from.SendGump(new HouseListGump(1011275, m_House.CoOwners, m_House, false));
|
||||
gumps.Close<HouseGump>();
|
||||
gumps.Close<HouseRemoveGump>();
|
||||
gumps.Close<HouseListGump>();
|
||||
gumps.Send(new HouseListGump(1011275, m_House.CoOwners, m_House, false));
|
||||
|
||||
break;
|
||||
}
|
||||
|
|
@ -491,10 +498,10 @@ namespace Server.Gumps
|
|||
{
|
||||
if (isOwner)
|
||||
{
|
||||
from.CloseGump<HouseGump>();
|
||||
from.CloseGump<HouseListGump>();
|
||||
from.CloseGump<HouseRemoveGump>();
|
||||
from.SendGump(new HouseRemoveGump(1011274, m_House.CoOwners, m_House, false));
|
||||
gumps.Close<HouseGump>();
|
||||
gumps.Close<HouseListGump>();
|
||||
gumps.Close<HouseRemoveGump>();
|
||||
gumps.Send(new HouseRemoveGump(1011274, m_House.CoOwners, m_House, false));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -520,10 +527,10 @@ namespace Server.Gumps
|
|||
}
|
||||
case 6: // List friends
|
||||
{
|
||||
from.CloseGump<HouseGump>();
|
||||
from.CloseGump<HouseListGump>();
|
||||
from.CloseGump<HouseRemoveGump>();
|
||||
from.SendGump(new HouseListGump(1011273, m_House.Friends, m_House, false));
|
||||
gumps.Close<HouseGump>();
|
||||
gumps.Close<HouseRemoveGump>();
|
||||
gumps.Close<HouseListGump>();
|
||||
gumps.Send(new HouseListGump(1011273, m_House.Friends, m_House, false));
|
||||
|
||||
break;
|
||||
}
|
||||
|
|
@ -547,10 +554,10 @@ namespace Server.Gumps
|
|||
{
|
||||
if (isCoOwner)
|
||||
{
|
||||
from.CloseGump<HouseGump>();
|
||||
from.CloseGump<HouseListGump>();
|
||||
from.CloseGump<HouseRemoveGump>();
|
||||
from.SendGump(new HouseRemoveGump(1011272, m_House.Friends, m_House, false));
|
||||
gumps.Close<HouseGump>();
|
||||
gumps.Close<HouseListGump>();
|
||||
gumps.Close<HouseRemoveGump>();
|
||||
gumps.Send(new HouseRemoveGump(1011272, m_House.Friends, m_House, false));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -590,19 +597,19 @@ namespace Server.Gumps
|
|||
}
|
||||
case 12: // List bans
|
||||
{
|
||||
from.CloseGump<HouseGump>();
|
||||
from.CloseGump<HouseListGump>();
|
||||
from.CloseGump<HouseRemoveGump>();
|
||||
from.SendGump(new HouseListGump(1011271, m_House.Bans, m_House, true));
|
||||
gumps.Close<HouseGump>();
|
||||
gumps.Close<HouseRemoveGump>();
|
||||
gumps.Close<HouseListGump>();
|
||||
gumps.Send(new HouseListGump(1011271, m_House.Bans, m_House, true));
|
||||
|
||||
break;
|
||||
}
|
||||
case 13: // Remove ban
|
||||
{
|
||||
from.CloseGump<HouseGump>();
|
||||
from.CloseGump<HouseListGump>();
|
||||
from.CloseGump<HouseRemoveGump>();
|
||||
from.SendGump(new HouseRemoveGump(1011269, m_House.Bans, m_House, true));
|
||||
gumps.Close<HouseGump>();
|
||||
gumps.Close<HouseListGump>();
|
||||
gumps.Close<HouseRemoveGump>();
|
||||
gumps.Send(new HouseRemoveGump(1011269, m_House.Bans, m_House, true));
|
||||
|
||||
break;
|
||||
}
|
||||
|
|
@ -630,8 +637,7 @@ namespace Server.Gumps
|
|||
}
|
||||
else
|
||||
{
|
||||
from.CloseGump<HouseDemolishGump>();
|
||||
from.SendGump(new HouseDemolishGump(from, m_House));
|
||||
gumps.Send(new HouseDemolishGump(from, m_House));
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue