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

Adds style cop (#109)

Browse source
This commit is contained in:
Kamron Batman 2020-04-26 00:16:02 -07:00 • committed by GitHub
parent 3e715bcb60
commit 556a17aba8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1725 changed files with 33831 additions and 38046 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Projects/Server/Menus/IMenu.cs
View file

@ -24,10 +24,10 @@ namespace Server.Menus
{
public interface IMenu
{
int Serial{ get; }
int EntryLength{ get; }
int Serial { get; }
int EntryLength { get; }
void SendTo(NetState state);
void OnCancel(NetState state);
void OnResponse(NetState state, int index);
}
}
}

23
Projects/Server/Menus/ItemListMenu.cs
View file

@ -31,17 +31,16 @@ namespace Server.Menus.ItemLists
Hue = hue;
}
public string Name{ get; }
public string Name { get; }
public int ItemID{ get; }
public int ItemID { get; }
public int Hue{ get; }
public int Hue { get; }
}
public class ItemListMenu : IMenu
{
private static int m_NextSerial;
private readonly int m_Serial;
public ItemListMenu(string question, ItemListEntry[] entries)
{
@ -50,20 +49,20 @@ namespace Server.Menus.ItemLists
do
{
m_Serial = m_NextSerial++;
m_Serial &= 0x7FFFFFFF;
} while (m_Serial == 0);
Serial = m_NextSerial++;
Serial &= 0x7FFFFFFF;
} while (Serial == 0);
m_Serial = (int)((uint)m_Serial | 0x80000000);
Serial = (int)((uint)Serial | 0x80000000);
}
public string Question{ get; }
public string Question { get; }
public ItemListEntry[] Entries{ get; set; }
public ItemListEntry[] Entries { get; set; }
int IMenu.Serial => m_Serial;
public int Serial { get; }
int IMenu.EntryLength => Entries.Length;
public int EntryLength => Entries.Length;
public virtual void OnCancel(NetState state)
{

17
Projects/Server/Menus/QuestionMenu.cs
View file

@ -25,7 +25,6 @@ namespace Server.Menus.Questions
public class QuestionMenu : IMenu
{
private static int m_NextSerial;
private readonly int m_Serial;
public QuestionMenu(string question, string[] answers)
{
@ -34,18 +33,18 @@ namespace Server.Menus.Questions
do
{
m_Serial = ++m_NextSerial;
m_Serial &= 0x7FFFFFFF;
} while (m_Serial == 0);
Serial = ++m_NextSerial;
Serial &= 0x7FFFFFFF;
} while (Serial == 0);
}
public string Question{ get; set; }
public string Question { get; set; }
public string[] Answers{ get; }
public string[] Answers { get; }
int IMenu.Serial => m_Serial;
public int Serial { get; }
int IMenu.EntryLength => Answers.Length;
public int EntryLength => Answers.Length;
public virtual void OnCancel(NetState state)
{
@ -61,4 +60,4 @@ namespace Server.Menus.Questions
state.Send(new DisplayQuestionMenu(this));
}
}
}
}