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

Fixes brace style (#248)

Browse source
This commit is contained in:
Kamron Batman 2020-09-13 21:49:46 -07:00 • committed by GitHub
parent a236617ad9
commit 8149620b0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1503 changed files with 28575 additions and 1717 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Projects/Server.Tests/Network/Packets/GumpUtilities.cs
View file

@ -33,7 +33,10 @@ namespace Server.Tests.Network.Packets
var packLength = (ulong)dest.Length - 8;
ZlibError ce = Zlib.Pack(dest.Slice(pos + 8), ref packLength, source, ZlibQuality.Default);
if (ce != ZlibError.Okay) Console.WriteLine("ZLib error: {0} (#{1})", ce, (int)ce);
if (ce != ZlibError.Okay)
{
Console.WriteLine("ZLib error: {0} (#{1})", ce, (int)ce);
}
dest.Write(ref pos, (int)(4 + packLength));
dest.Write(ref pos, length);

42
Projects/Server.Tests/Network/Packets/Old/Outgoing/AccountPacketTests.cs
View file

@ -137,15 +137,23 @@ namespace Server.Tests.Network.Packets
flags &= ~FeatureFlags.UOTD;
if (ns.Account.Limit > 6)
{
flags |= FeatureFlags.SeventhCharacterSlot;
}
else
{
flags |= FeatureFlags.SixthCharacterSlot;
}
}
if (ns.ExtendedSupportedFeatures)
{
expectedData.Write(ref pos, (uint)flags);
}
else
{
expectedData.Write(ref pos, (ushort)flags);
}
AssertThat.Equal(data, expectedData);
}
@ -194,7 +202,9 @@ namespace Server.Tests.Network.Packets
var map = m.Map;
if (map == null || map == Map.Internal)
{
map = m.LogoutMap;
}
expectedData.Write(ref pos, (ushort)(map?.Width ?? Map.Felucca.Width));
expectedData.Write(ref pos, (ushort)(map?.Height ?? Map.Felucca.Height));
@ -234,11 +244,13 @@ namespace Server.Tests.Network.Packets
var highSlot = -1;
for (var i = account.Length - 1; i >= 0; i--)
{
if (account[i] != null)
{
highSlot = i;
break;
}
}
var count = Math.Max(Math.Max(highSlot + 1, account.Limit), 5);
expectedData.Write(ref pos, (byte)count);
@ -303,11 +315,13 @@ namespace Server.Tests.Network.Packets
var highSlot = -1;
for (var i = account.Length - 1; i >= 0; i--)
{
if (account[i] != null)
{
highSlot = i;
break;
}
}
var count = Math.Max(Math.Max(highSlot + 1, account.Limit), 5);
expectedData.Write(ref pos, (byte)count);
@ -367,13 +381,19 @@ namespace Server.Tests.Network.Packets
var flags = ExpansionInfo.GetInfo(Expansion.EJ).CharacterListFlags;
if (count > 6)
{
flags |= CharacterListFlags.SeventhCharacterSlot |
CharacterListFlags.SixthCharacterSlot; // 7th Character Slot
}
else if (count == 6)
{
flags |= CharacterListFlags.SixthCharacterSlot; // 6th Character Slot
}
else if (account.Limit == 1)
{
flags |= CharacterListFlags.SlotLimit &
CharacterListFlags.OneCharacterSlot; // Limit Characters & One Character
}
expectedData.Write(ref pos, (int)flags);
expectedData.Write(ref pos, (short)-1);
@ -404,11 +424,13 @@ namespace Server.Tests.Network.Packets
var highSlot = -1;
for (var i = account.Length - 1; i >= 0; i--)
{
if (account[i] != null)
{
highSlot = i;
break;
}
}
var count = Math.Max(Math.Max(highSlot + 1, account.Limit), 5);
expectedData.Write(ref pos, (byte)count);
@ -458,13 +480,19 @@ namespace Server.Tests.Network.Packets
var flags = ExpansionInfo.GetInfo(Expansion.EJ).CharacterListFlags;
if (count > 6)
{
flags |= CharacterListFlags.SeventhCharacterSlot |
CharacterListFlags.SixthCharacterSlot; // 7th Character Slot
}
else if (count == 6)
{
flags |= CharacterListFlags.SixthCharacterSlot; // 6th Character Slot
}
else if (account.Limit == 1)
{
flags |= CharacterListFlags.SlotLimit &
CharacterListFlags.OneCharacterSlot; // Limit Characters & One Character
}
expectedData.Write(ref pos, (int)flags);
@ -546,8 +574,12 @@ namespace Server.Tests.Network.Packets
{
m_Mobiles = mobiles;
foreach (var mobile in mobiles)
{
if (mobile != null)
{
mobile.Account = this;
}
}
Length = mobiles.Length;
Count = mobiles.Count(t => t != null);
@ -571,7 +603,10 @@ namespace Server.Tests.Network.Packets
public bool WithdrawGold(int amount)
{
if (TotalGold - amount < 0) return false;
if (TotalGold - amount < 0)
{
return false;
}
TotalGold -= amount;
return true;
@ -579,7 +614,10 @@ namespace Server.Tests.Network.Packets
public bool WithdrawPlat(int amount)
{
if (TotalPlat - amount < 0) return false;
if (TotalPlat - amount < 0)
{
return false;
}
TotalPlat -= amount;
return true;

10
Projects/Server.Tests/Network/Packets/Old/Outgoing/EquipmentPacketTests.cs
View file

@ -32,7 +32,10 @@ namespace Server.Tests.Network.Packets
var attrs = info.Attributes;
var length = 17 + (info.Unidentified ? 4 : 0) + attrs.Length * 6;
if (info.Crafter != null) length += 6 + (info.Crafter.Name?.Length ?? 0);
if (info.Crafter != null)
{
length += 6 + (info.Crafter.Name?.Length ?? 0);
}
Span<byte> expectedData = stackalloc byte[length];
@ -51,7 +54,10 @@ namespace Server.Tests.Network.Packets
expectedData.WriteAscii(ref pos, name);
}
if (info.Unidentified) expectedData.Write(ref pos, -4);
if (info.Unidentified)
{
expectedData.Write(ref pos, -4);
}
for (var i = 0; i < attrs.Length; i++)
{

6
Projects/Server.Tests/Network/Packets/Old/Outgoing/GumpPacketTests.cs
View file

@ -120,7 +120,9 @@ namespace Server.Tests.Network.Packets
expectedData.Write(ref pos, (ushort)gump.Strings.Count);
for (var i = 0; i < gump.Strings.Count; ++i)
{
expectedData.WriteBigUni(ref pos, gump.Strings[i] ?? "");
}
expectedData.Slice(1, 2).Write((ushort)pos); // Length
@ -198,7 +200,9 @@ namespace Server.Tests.Network.Packets
var bufferPos = 0;
foreach (var layout in layoutList)
{
buffer.WriteAscii(ref bufferPos, layout);
}
#if NO_LOCAL_INIT
buffer.Write(ref bufferPos, (byte)0); // Layout terminator
@ -216,7 +220,9 @@ namespace Server.Tests.Network.Packets
bufferPos = 0;
foreach (var str in gump.Strings)
{
buffer.WriteBigUni(ref bufferPos, str);
}
expectedData.WritePacked(ref pos, buffer.Slice(0, bufferPos));

37
Projects/Server.Tests/Network/Packets/Old/Outgoing/ItemPacketTests.cs
View file

@ -43,23 +43,35 @@ namespace Server.Tests.Network.Packets
pos += 2; // Length
if (item.Amount != 0)
{
expectedData.Write(ref pos, serial | 0x80000000);
}
else
{
expectedData.Write(ref pos, serial & 0x7FFFFFFF);
}
if (item is BaseMulti)
{
expectedData.Write(ref pos, (ushort)(item.ItemID | 0x4000));
}
else
{
expectedData.Write(ref pos, (ushort)item.ItemID);
}
if (item.Amount != 0)
{
expectedData.Write(ref pos, (ushort)item.Amount);
}
var direction = (byte)item.Direction;
var x = (ushort)(item.X & 0x7FFF);
if (direction != 0)
{
x |= 0x8000;
}
expectedData.Write(ref pos, x);
@ -67,21 +79,34 @@ namespace Server.Tests.Network.Packets
var flags = item.GetPacketFlags();
var y = (ushort)(item.Y & 0x3FFF);
if (hue != 0) y |= 0x8000;
if (flags != 0) y |= 0x4000;
if (hue != 0)
{
y |= 0x8000;
}
if (flags != 0)
{
y |= 0x4000;
}
expectedData.Write(ref pos, y);
if (direction != 0)
{
expectedData.Write(ref pos, direction);
}
expectedData.Write(ref pos, (byte)item.Z);
if (hue != 0)
{
expectedData.Write(ref pos, (ushort)hue);
}
if (flags != 0)
{
expectedData.Write(ref pos, (byte)flags);
}
// Length
expectedData.Slice(1, 2).Write((ushort)pos);
@ -321,6 +346,7 @@ namespace Server.Tests.Network.Packets
ushort count = 0;
for (var i = 0; i < 64; i++)
{
if ((content & (1ul << i)) != 0)
{
expectedData.Write(ref pos, 0x7FFFFFFF - i);
@ -344,6 +370,7 @@ namespace Server.Tests.Network.Packets
#endif
count++;
}
}
expectedData.Slice(1, 2).Write((ushort)pos); // Length
expectedData.Slice(3, 2).Write(count); // Count
@ -371,6 +398,7 @@ namespace Server.Tests.Network.Packets
ushort count = 0;
for (var i = 0; i < 64; i++)
{
if ((content & (1ul << i)) != 0)
{
expectedData.Write(ref pos, 0x7FFFFFFF - i);
@ -395,6 +423,7 @@ namespace Server.Tests.Network.Packets
#endif
count++;
}
}
expectedData.Slice(1, 2).Write((ushort)pos); // Length
expectedData.Slice(3, 2).Write(count); // Count
@ -489,7 +518,9 @@ namespace Server.Tests.Network.Packets
{
var child = cont.Items[i];
if (child.Deleted || !m.CanSee(child))
{
continue;
}
expectedData.Write(ref pos, child.Serial);
expectedData.Write(ref pos, (ushort)child.ItemID);
@ -539,7 +570,9 @@ namespace Server.Tests.Network.Packets
{
var child = cont.Items[i];
if (child.Deleted || !m.CanSee(child))
{
continue;
}
expectedData.Write(ref pos, child.Serial);
expectedData.Write(ref pos, (ushort)child.ItemID);

16
Projects/Server.Tests/Network/Packets/Old/Outgoing/MenuPacketTests.cs
View file

@ -52,7 +52,9 @@ namespace Server.Tests.Network.Packets
{
length += 5 + entry.Name.Length;
if (entriesCount == 255)
{
break;
}
entriesCount++;
}
@ -104,7 +106,9 @@ namespace Server.Tests.Network.Packets
{
length += 5 + answer.Length;
if (answersCount == 255)
{
break;
}
answersCount++;
}
@ -171,10 +175,14 @@ namespace Server.Tests.Network.Packets
var range = entry.Range;
if (range == -1)
{
range = 18;
}
if (!(entry.Enabled && menu.From.InRange(item.GetWorldLocation(), range)))
{
flags |= CMEFlags.Disabled;
}
expectedData.Write(ref pos, (ushort)flags);
}
@ -218,20 +226,28 @@ namespace Server.Tests.Network.Packets
var color = entry.Color & 0xFFFF;
if (color != 0xFFFF)
{
flags |= CMEFlags.Colored;
}
var range = entry.Range;
if (range == -1)
{
range = 18;
}
if (!(entry.Enabled && menu.From.InRange(item.GetWorldLocation(), range)))
{
flags |= CMEFlags.Disabled;
}
expectedData.Write(ref pos, (ushort)flags);
if ((flags & CMEFlags.Colored) != 0)
{
expectedData.Write(ref pos, (ushort)color);
}
}
AssertThat.Equal(data, expectedData);

40
Projects/Server.Tests/Network/Packets/Old/Outgoing/MobilePacketTests.cs
View file

@ -261,10 +261,22 @@ namespace Server.Tests.Network.Packets
int type;
var notSelf = beholder != beheld;
if (notSelf) type = 0;
else if (Core.HS && ns.ExtendedStatus) type = 6;
else if (Core.ML && ns.SupportsExpansion(Expansion.ML)) type = 5;
else type = Core.AOS ? 4 : 3;
if (notSelf)
{
type = 0;
}
else if (Core.HS && ns.ExtendedStatus)
{
type = 6;
}
else if (Core.ML && ns.SupportsExpansion(Expansion.ML))
{
type = 5;
}
else
{
type = Core.AOS ? 4 : 3;
}
expectedData.Write(ref pos, beheld.Serial);
expectedData.WriteAsciiFixed(ref pos, beheld.Name, 30);
@ -320,8 +332,12 @@ namespace Server.Tests.Network.Packets
expectedData.Write(ref pos, beheld.TithingPoints);
if (type >= 6)
{
for (var i = 0; i < 15; ++i)
{
expectedData.Write(ref pos, (ushort)beheld.GetAOSStatus(i));
}
}
}
expectedData.Slice(1, 2).Write((ushort)pos); // Length
@ -502,9 +518,14 @@ namespace Server.Tests.Network.Packets
var count = items.Count;
if (beheld.HairItemID > 0)
{
count++;
}
if (beheld.FacialHairItemID > 0)
{
count++;
}
var length = 23 + count * 9; // Max Size
@ -645,9 +666,14 @@ namespace Server.Tests.Network.Packets
var count = items.Count;
if (beheld.HairItemID > 0)
{
count++;
}
if (beheld.FacialHairItemID > 0)
{
count++;
}
var length = 23 + count * 9; // Max Size
@ -686,7 +712,9 @@ namespace Server.Tests.Network.Packets
hue = isSolidHue ? beheld.SolidHueOverride : item.Hue;
if (hue != 0)
{
itemId |= 0x8000;
}
expectedData.Write(ref pos, item.Serial);
expectedData.Write(ref pos, (ushort)itemId);
@ -703,7 +731,9 @@ namespace Server.Tests.Network.Packets
hue = isSolidHue ? beheld.SolidHueOverride : beheld.HairHue;
if (hue != 0)
{
itemId |= 0x8000;
}
expectedData.Write(ref pos, HairInfo.FakeSerial(beheld));
expectedData.Write(ref pos, (ushort)itemId);
@ -719,7 +749,9 @@ namespace Server.Tests.Network.Packets
hue = isSolidHue ? beheld.SolidHueOverride : beheld.FacialHairHue;
if (hue != 0)
{
itemId |= 0x8000;
}
expectedData.Write(ref pos, FacialHairInfo.FakeSerial(beheld));
expectedData.Write(ref pos, (ushort)itemId);

5
Projects/Server.Tests/Network/Packets/Old/Outgoing/PlayerPacketTests.cs
View file

@ -374,9 +374,14 @@ namespace Server.Tests.Network.Packets
expectedData.WriteAsciiFixed(ref pos, title, 60);
byte flags = 0x00;
if (warmode)
{
flags |= 0x01;
}
if (canLift)
{
flags |= 0x02;
}
expectedData.Write(ref pos, flags);

2
Projects/Server.Tests/Network/Packets/Old/Outgoing/SecureTradePacketTests.cs
View file

@ -34,7 +34,9 @@ namespace Server.Tests.Network.Packets
expectedData.Write(ref pos, secondCont.Serial);
expectedData.Write(ref pos, hasName);
if (hasName)
{
expectedData.WriteAsciiFixed(ref pos, name, 30);
}
AssertThat.Equal(data, expectedData);
}