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

fix: Cleans up core code (#1187)

Browse source 
**Only one functional change**
* Fixes a bug in LogFactory where `Warning` is being logged as `Information`

Non-functional changes:
* Updates/Fixes copyright headers
* Removes namespace scopes for core files.

View with [whitespace off](https://github.com/modernuo/ModernUO/pull/1187/files?w=1).
This commit is contained in:
Kamron Batman 2022-10-10 21:47:08 -07:00 • committed by GitHub
parent 0138d40bda
commit f268d5d4e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
262 changed files with 28527 additions and 28646 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,13 +1,12 @@
using Server.Network;
namespace Server.Menus
namespace Server.Menus;
public interface IMenu
{
public interface IMenu
{
int Serial { get; }
int EntryLength { get; }
void SendTo(NetState state);
void OnCancel(NetState state);
void OnResponse(NetState state, int index);
}
int Serial { get; }
int EntryLength { get; }
void SendTo(NetState state);
void OnCancel(NetState state);
void OnResponse(NetState state, int index);
}

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

@ -1,61 +1,60 @@
using Server.Network;
namespace Server.Menus.ItemLists
namespace Server.Menus.ItemLists;
public class ItemListEntry
{
public class ItemListEntry
public ItemListEntry(string name, int itemID, int hue = 0)
{
public ItemListEntry(string name, int itemID, int hue = 0)
{
Name = name?.Trim() ?? "";
ItemID = itemID;
Hue = hue;
}
public string Name { get; }
public int ItemID { get; }
public int Hue { get; }
Name = name?.Trim() ?? "";
ItemID = itemID;
Hue = hue;
}
public class ItemListMenu : IMenu
public string Name { get; }
public int ItemID { get; }
public int Hue { get; }
}
public class ItemListMenu : IMenu
{
private static int m_NextSerial;
public ItemListMenu(string question, ItemListEntry[] entries)
{
private static int m_NextSerial;
Question = question.Trim();
Entries = entries;
public ItemListMenu(string question, ItemListEntry[] entries)
do
{
Question = question.Trim();
Entries = entries;
Serial = m_NextSerial++;
Serial &= 0x7FFFFFFF;
} while (Serial == 0);
do
{
Serial = m_NextSerial++;
Serial &= 0x7FFFFFFF;
} while (Serial == 0);
Serial = (int)((uint)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; }
public int Serial { get; }
public int Serial { get; }
public int EntryLength => Entries.Length;
public int EntryLength => Entries.Length;
public virtual void OnCancel(NetState state)
{
}
public virtual void OnCancel(NetState state)
{
}
public virtual void OnResponse(NetState state, int index)
{
}
public virtual void OnResponse(NetState state, int index)
{
}
public void SendTo(NetState state)
{
state.AddMenu(this);
state.SendDisplayItemListMenu(this);
}
public void SendTo(NetState state)
{
state.AddMenu(this);
state.SendDisplayItemListMenu(this);
}
}

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

@ -1,43 +1,42 @@
using Server.Network;
namespace Server.Menus.Questions
namespace Server.Menus.Questions;
public class QuestionMenu : IMenu
{
public class QuestionMenu : IMenu
private static int m_NextSerial;
public QuestionMenu(string question, string[] answers)
{
private static int m_NextSerial;
Question = question?.Trim() ?? "";
Answers = answers;
public QuestionMenu(string question, string[] answers)
do
{
Question = question?.Trim() ?? "";
Answers = answers;
Serial = ++m_NextSerial;
Serial &= 0x7FFFFFFF;
} while (Serial == 0);
}
do
{
Serial = ++m_NextSerial;
Serial &= 0x7FFFFFFF;
} while (Serial == 0);
}
public string Question { get; }
public string Question { get; }
public string[] Answers { get; }
public string[] Answers { get; }
public int Serial { get; }
public int Serial { get; }
public int EntryLength => Answers.Length;
public int EntryLength => Answers.Length;
public virtual void OnCancel(NetState state)
{
}
public virtual void OnCancel(NetState state)
{
}
public virtual void OnResponse(NetState state, int index)
{
}
public virtual void OnResponse(NetState state, int index)
{
}
public void SendTo(NetState state)
{
state.AddMenu(this);
state.SendDisplayQuestionMenu(this);
}
public void SendTo(NetState state)
{
state.AddMenu(this);
state.SendDisplayQuestionMenu(this);
}
}