epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed SubCell to byte

Browse Source
This commit is contained in:
teinarss
2018-08-05 13:08:43 +02:00
committed by Paul Chote
parent 52a7d39e51
commit e353c8c176
7 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Game/Exts.cs
View File

@@ -488,6 +488,11 @@ namespace OpenRA
return int.Parse(s, NumberStyles.Integer, NumberFormatInfo.InvariantInfo);
}
public static byte ParseByte(string s)
{
return byte.Parse(s, NumberStyles.Integer, NumberFormatInfo.InvariantInfo);
}
public static bool TryParseIntegerInvariant(string s, out int i)
{
return int.TryParse(s, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out i);

4
OpenRA.Game/Network/Order.cs
View File

@@ -129,7 +129,7 @@ namespace OpenRA
if (flags.HasField(OrderFields.TargetIsCell))
{
var cell = new CPos(r.ReadInt32(), r.ReadInt32(), r.ReadByte());
var subCell = (SubCell)r.ReadInt32();
var subCell = (SubCell)r.ReadByte();
if (world != null)
target = Target.FromCell(world, cell, subCell);
}
@@ -311,7 +311,7 @@ namespace OpenRA
if (fields.HasField(OrderFields.TargetIsCell))
{
w.Write(Target.SerializableCell.Value);
w.Write((int)Target.SerializableSubCell);
w.Write((byte)Target.SerializableSubCell);
}
else
w.Write(Target.SerializablePos);

2
OpenRA.Game/Traits/TraitsInterfaces.cs
View File

@@ -292,7 +292,7 @@ namespace OpenRA.Traits
Pair<CPos, SubCell>[] OccupiedCells();
}
public enum SubCell { Invalid = int.MinValue, Any = int.MinValue / 2, FullCell = 0, First = 1 }
public enum SubCell : byte { Invalid = byte.MaxValue, Any = byte.MaxValue - 1, FullCell = 0, First = 1 }
public interface IPositionableInfo : IOccupySpaceInfo
{