Fixes code according to modern code style. Fixes a few expression bugs.
This commit is contained in:
parent
89eea25e5f
commit
970fd563b2
3324 changed files with 441118 additions and 433755 deletions
|
|
@ -1,71 +1,69 @@
|
|||
using Server.Gumps;
|
||||
using Server.Network;
|
||||
using Server.Mobiles;
|
||||
using Server.Network;
|
||||
|
||||
namespace Server.Guilds
|
||||
{
|
||||
public delegate void SearchSelectionCallback( GuildDisplayType display );
|
||||
public delegate void SearchSelectionCallback(GuildDisplayType display);
|
||||
|
||||
public class GuildAdvancedSearchGump : BaseGuildGump
|
||||
{
|
||||
private GuildDisplayType m_Display;
|
||||
private SearchSelectionCallback m_Callback;
|
||||
public class GuildAdvancedSearchGump : BaseGuildGump
|
||||
{
|
||||
private SearchSelectionCallback m_Callback;
|
||||
private GuildDisplayType m_Display;
|
||||
|
||||
public GuildAdvancedSearchGump( PlayerMobile pm, Guild g, GuildDisplayType display, SearchSelectionCallback callback ) : base( pm, g )
|
||||
{
|
||||
m_Callback = callback;
|
||||
m_Display = display;
|
||||
PopulateGump();
|
||||
}
|
||||
public GuildAdvancedSearchGump(PlayerMobile pm, Guild g, GuildDisplayType display, SearchSelectionCallback callback)
|
||||
: base(pm, g)
|
||||
{
|
||||
m_Callback = callback;
|
||||
m_Display = display;
|
||||
PopulateGump();
|
||||
}
|
||||
|
||||
public override void PopulateGump()
|
||||
{
|
||||
base.PopulateGump();
|
||||
public override void PopulateGump()
|
||||
{
|
||||
base.PopulateGump();
|
||||
|
||||
AddHtmlLocalized( 431, 43, 110, 26, 1062978, 0xF, false, false ); // Diplomacy
|
||||
AddHtmlLocalized(431, 43, 110, 26, 1062978, 0xF, false, false); // Diplomacy
|
||||
|
||||
AddHtmlLocalized( 65, 80, 480, 26, 1063124, 0xF, true, false ); // <i>Advanced Search Options</i>
|
||||
AddHtmlLocalized(65, 80, 480, 26, 1063124, 0xF, true, false); // <i>Advanced Search Options</i>
|
||||
|
||||
AddHtmlLocalized( 65, 110, 480, 26, 1063136 + (int)m_Display, 0xF, false, false ); // Showing All Guilds/w/Relation/Waiting Relation
|
||||
AddHtmlLocalized(65, 110, 480, 26, 1063136 + (int)m_Display, 0xF, false,
|
||||
false); // Showing All Guilds/w/Relation/Waiting Relation
|
||||
|
||||
AddGroup( 1 );
|
||||
AddRadio( 75, 140, 0xD2, 0xD3, false, 2 );
|
||||
AddHtmlLocalized( 105, 140, 200, 26, 1063006, 0x0, false, false ); // Show Guilds with Relationship
|
||||
AddRadio( 75, 170, 0xD2, 0xD3, false, 1 );
|
||||
AddHtmlLocalized( 105, 170, 200, 26, 1063005, 0x0, false, false ); // Show Guilds Awaiting Action
|
||||
AddRadio( 75, 200, 0xD2, 0xD3, false, 0 );
|
||||
AddHtmlLocalized( 105, 200, 200, 26, 1063007, 0x0, false, false ); // Show All Guilds
|
||||
AddGroup(1);
|
||||
AddRadio(75, 140, 0xD2, 0xD3, false, 2);
|
||||
AddHtmlLocalized(105, 140, 200, 26, 1063006, 0x0, false, false); // Show Guilds with Relationship
|
||||
AddRadio(75, 170, 0xD2, 0xD3, false, 1);
|
||||
AddHtmlLocalized(105, 170, 200, 26, 1063005, 0x0, false, false); // Show Guilds Awaiting Action
|
||||
AddRadio(75, 200, 0xD2, 0xD3, false, 0);
|
||||
AddHtmlLocalized(105, 200, 200, 26, 1063007, 0x0, false, false); // Show All Guilds
|
||||
|
||||
AddBackground( 450, 370, 100, 26, 0x2486 );
|
||||
AddButton( 455, 375, 0x845, 0x846, 5, GumpButtonType.Reply, 0 );
|
||||
AddHtmlLocalized( 480, 373, 60, 26, 1006044, 0x0, false, false ); // OK
|
||||
AddBackground( 340, 370, 100, 26, 0x2486 );
|
||||
AddButton( 345, 375, 0x845, 0x846, 0, GumpButtonType.Reply, 0 );
|
||||
AddHtmlLocalized( 370, 373, 60, 26, 1006045, 0x0, false, false ); // Cancel
|
||||
}
|
||||
AddBackground(450, 370, 100, 26, 0x2486);
|
||||
AddButton(455, 375, 0x845, 0x846, 5, GumpButtonType.Reply, 0);
|
||||
AddHtmlLocalized(480, 373, 60, 26, 1006044, 0x0, false, false); // OK
|
||||
AddBackground(340, 370, 100, 26, 0x2486);
|
||||
AddButton(345, 375, 0x845, 0x846, 0, GumpButtonType.Reply, 0);
|
||||
AddHtmlLocalized(370, 373, 60, 26, 1006045, 0x0, false, false); // Cancel
|
||||
}
|
||||
|
||||
|
||||
public override void OnResponse( NetState sender, RelayInfo info )
|
||||
{
|
||||
base.OnResponse( sender, info );
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
{
|
||||
base.OnResponse(sender, info);
|
||||
|
||||
if ( !(sender.Mobile is PlayerMobile pm) || !IsMember( pm, guild ) )
|
||||
return;
|
||||
if (!(sender.Mobile is PlayerMobile pm) || !IsMember(pm, guild))
|
||||
return;
|
||||
|
||||
GuildDisplayType display = m_Display;
|
||||
GuildDisplayType display = m_Display;
|
||||
|
||||
if ( info.ButtonID == 5 )
|
||||
{
|
||||
for( int i = 0; i < 3; i++ )
|
||||
{
|
||||
if ( info.IsSwitched( i ) )
|
||||
{
|
||||
display = (GuildDisplayType)i;
|
||||
m_Callback( display );
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (info.ButtonID == 5)
|
||||
for (int i = 0; i < 3; i++)
|
||||
if (info.IsSwitched(i))
|
||||
{
|
||||
display = (GuildDisplayType)i;
|
||||
m_Callback(display);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue