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

Fixes code according to modern code style. Fixes a few expression bugs.

Browse source
This commit is contained in:
Kamron Batman 2018-09-15 09:58:51 -07:00
parent 89eea25e5f
commit 970fd563b2
3324 changed files with 441118 additions and 433755 deletions
Download patch file Download diff file Expand all files Collapse all files

166
Server/Gumps/GumpButton.cs
View file

@ -18,105 +18,103 @@
*
***************************************************************************/
using System;
using Server.Network;
namespace Server.Gumps
{
public enum GumpButtonType
{
Page = 0,
Reply = 1
}
public enum GumpButtonType
{
Page = 0,
Reply = 1
}
public class GumpButton : GumpEntry
{
private int m_X, m_Y;
private int m_ID1, m_ID2;
private int m_ButtonID;
private GumpButtonType m_Type;
private int m_Param;
public class GumpButton : GumpEntry
{
private static byte[] m_LayoutName = Gump.StringToBuffer("button");
private int m_ButtonID;
private int m_ID1, m_ID2;
private int m_Param;
private GumpButtonType m_Type;
private int m_X, m_Y;
public GumpButton( int x, int y, int normalID, int pressedID, int buttonID, GumpButtonType type, int param )
{
m_X = x;
m_Y = y;
m_ID1 = normalID;
m_ID2 = pressedID;
m_ButtonID = buttonID;
m_Type = type;
m_Param = param;
}
public GumpButton(int x, int y, int normalID, int pressedID, int buttonID, GumpButtonType type, int param)
{
m_X = x;
m_Y = y;
m_ID1 = normalID;
m_ID2 = pressedID;
m_ButtonID = buttonID;
m_Type = type;
m_Param = param;
}
public int X
{
get => m_X;
set => Delta( ref m_X, value );
}
public int X
{
get => m_X;
set => Delta(ref m_X, value);
}
public int Y
{
get => m_Y;
set => Delta( ref m_Y, value );
}
public int Y
{
get => m_Y;
set => Delta(ref m_Y, value);
}
public int NormalID
{
get => m_ID1;
set => Delta( ref m_ID1, value );
}
public int NormalID
{
get => m_ID1;
set => Delta(ref m_ID1, value);
}
public int PressedID
{
get => m_ID2;
set => Delta( ref m_ID2, value );
}
public int PressedID
{
get => m_ID2;
set => Delta(ref m_ID2, value);
}
public int ButtonID
{
get => m_ButtonID;
set => Delta( ref m_ButtonID, value );
}
public int ButtonID
{
get => m_ButtonID;
set => Delta(ref m_ButtonID, value);
}
public GumpButtonType Type
{
get => m_Type;
set
{
if ( m_Type != value )
{
m_Type = value;
public GumpButtonType Type
{
get => m_Type;
set
{
if (m_Type != value)
{
m_Type = value;
Gump parent = Parent;
Gump parent = Parent;
parent?.Invalidate();
}
}
}
parent?.Invalidate();
}
}
}
public int Param
{
get => m_Param;
set => Delta( ref m_Param, value );
}
public int Param
{
get => m_Param;
set => Delta(ref m_Param, value);
}
public override string Compile( NetState ns )
{
return $"{{ button {m_X} {m_Y} {m_ID1} {m_ID2} {(int) m_Type} {m_Param} {m_ButtonID} }}";
}
public override string Compile(NetState ns)
{
return $"{{ button {m_X} {m_Y} {m_ID1} {m_ID2} {(int)m_Type} {m_Param} {m_ButtonID} }}";
}
private static byte[] m_LayoutName = Gump.StringToBuffer( "button" );
public override void AppendTo( NetState ns, IGumpWriter disp )
{
disp.AppendLayout( m_LayoutName );
disp.AppendLayout( m_X );
disp.AppendLayout( m_Y );
disp.AppendLayout( m_ID1 );
disp.AppendLayout( m_ID2 );
disp.AppendLayout( (int)m_Type );
disp.AppendLayout( m_Param );
disp.AppendLayout( m_ButtonID );
}
}
public override void AppendTo(NetState ns, IGumpWriter disp)
{
disp.AppendLayout(m_LayoutName);
disp.AppendLayout(m_X);
disp.AppendLayout(m_Y);
disp.AppendLayout(m_ID1);
disp.AppendLayout(m_ID2);
disp.AppendLayout((int)m_Type);
disp.AppendLayout(m_Param);
disp.AppendLayout(m_ButtonID);
}
}
}