Add readonly to structs

OpenRA.Game/Actor.cs

@@ -25,7 +25,7 @@ namespace OpenRA
 {
 	public sealed class Actor : IScriptBindable, IScriptNotifyBind, ILuaTableBinding, ILuaEqualityBinding, ILuaToStringBinding, IEquatable<Actor>, IDisposable
 	{
-		internal struct SyncHash
+		internal readonly struct SyncHash
 		{
 			public readonly ISync Trait;
 			readonly Func<object, int> hashFunction;

OpenRA.Game/CPos.cs

@@ -16,7 +16,7 @@
 
 namespace OpenRA
 {
-	public struct CPos : IScriptBindable, ILuaAdditionBinding, ILuaSubtractionBinding, ILuaEqualityBinding, ILuaTableBinding, IEquatable<CPos>
+	public readonly struct CPos : IScriptBindable, ILuaAdditionBinding, ILuaSubtractionBinding, ILuaEqualityBinding, ILuaTableBinding, IEquatable<CPos>
 	{
 		// Coordinates are packed in a 32 bit signed int
 		// X and Y are 12 bits (signed): -2048...2047

OpenRA.Game/CVec.cs

@@ -17,7 +17,7 @@
 
 namespace OpenRA
 {
-	public struct CVec : IScriptBindable, ILuaAdditionBinding, ILuaSubtractionBinding, ILuaUnaryMinusBinding, ILuaEqualityBinding, ILuaTableBinding, IEquatable<CVec>
+	public readonly struct CVec : IScriptBindable, ILuaAdditionBinding, ILuaSubtractionBinding, ILuaUnaryMinusBinding, ILuaEqualityBinding, ILuaTableBinding, IEquatable<CVec>
 	{
 		public readonly int X, Y;
 

OpenRA.Game/Graphics/Animation.cs

@@ -52,7 +52,7 @@ public Animation(World world, string name, Func<WAngle> facingFunc, Func<bool> p
 		public int CurrentFrame => backwards ? CurrentSequence.Length - frame - 1 : frame;
 		public Sprite Image => CurrentSequence.GetSprite(CurrentFrame, facingFunc());
 
-		public IRenderable[] Render(WPos pos, WVec offset, int zOffset, PaletteReference palette)
+		public IRenderable[] Render(WPos pos, in WVec offset, int zOffset, PaletteReference palette)
 		{
 			var tintModifiers = CurrentSequence.IgnoreWorldTint ? TintModifiers.IgnoreWorldTint : TintModifiers.None;
 			var alpha = CurrentSequence.GetAlpha(CurrentFrame);
@@ -68,7 +68,7 @@ public IRenderable[] Render(WPos pos, WVec offset, int zOffset, PaletteReference
 			return new IRenderable[] { imageRenderable };
 		}
 
-		public IRenderable[] RenderUI(WorldRenderer wr, int2 pos, WVec offset, int zOffset, PaletteReference palette, float scale = 1f)
+		public IRenderable[] RenderUI(WorldRenderer wr, int2 pos, in WVec offset, int zOffset, PaletteReference palette, float scale = 1f)
 		{
 			scale *= CurrentSequence.Scale;
 			var screenOffset = (scale * wr.ScreenVectorComponents(offset)).XY.ToInt2();
@@ -87,7 +87,7 @@ public IRenderable[] RenderUI(WorldRenderer wr, int2 pos, WVec offset, int zOffs
 			return new IRenderable[] { imageRenderable };
 		}
 
-		public Rectangle ScreenBounds(WorldRenderer wr, WPos pos, WVec offset)
+		public Rectangle ScreenBounds(WorldRenderer wr, WPos pos, in WVec offset)
 		{
 			var scale = CurrentSequence.Scale;
 			var xy = wr.ScreenPxPosition(pos) + wr.ScreenPxOffset(offset);

OpenRA.Game/Graphics/Model.cs

@@ -29,7 +29,7 @@ public interface IModel
 		Rectangle AggregateBounds { get; }
 	}
 
-	public struct ModelRenderData
+	public readonly struct ModelRenderData
 	{
 		public readonly int Start;
 		public readonly int Count;

OpenRA.Game/Graphics/ModelAnimation.cs

@@ -14,7 +14,7 @@
 
 namespace OpenRA.Graphics
 {
-	public struct ModelAnimation
+	public readonly struct ModelAnimation
 	{
 		public readonly IModel Model;
 		public readonly Func<WVec> OffsetFunc;

OpenRA.Game/Graphics/PlatformInterfaces.cs

@@ -145,7 +145,7 @@ public enum PrimitiveType
 		TriangleList,
 	}
 
-	public struct Range<T>
+	public readonly struct Range<T>
 	{
 		public readonly T Start, End;
 		public Range(T start, T end) { Start = start; End = end; }

OpenRA.Game/Graphics/Renderable.cs

@@ -21,7 +21,7 @@ public interface IRenderable
 		bool IsDecoration { get; }
 
 		IRenderable WithZOffset(int newOffset);
-		IRenderable OffsetBy(WVec offset);
+		IRenderable OffsetBy(in WVec offset);
 		IRenderable AsDecoration();
 
 		IFinalizedRenderable PrepareRender(WorldRenderer wr);

OpenRA.Game/Graphics/SpriteRenderable.cs

@@ -55,7 +55,7 @@ public SpriteRenderable(Sprite sprite, WPos pos, WVec offset, int zOffset, Palet
 
 		public IPalettedRenderable WithPalette(PaletteReference newPalette) { return new SpriteRenderable(sprite, pos, offset, zOffset, newPalette, scale, alpha, tint, tintModifiers, isDecoration); }
 		public IRenderable WithZOffset(int newOffset) { return new SpriteRenderable(sprite, pos, offset, newOffset, palette, scale, alpha, tint, tintModifiers, isDecoration); }
-		public IRenderable OffsetBy(WVec vec) { return new SpriteRenderable(sprite, pos + vec, offset, zOffset, palette, scale, alpha, tint, tintModifiers, isDecoration); }
+		public IRenderable OffsetBy(in WVec vec) { return new SpriteRenderable(sprite, pos + vec, offset, zOffset, palette, scale, alpha, tint, tintModifiers, isDecoration); }
 		public IRenderable AsDecoration() { return new SpriteRenderable(sprite, pos, offset, zOffset, palette, scale, alpha, tint, tintModifiers, true); }
 
 		public IModifyableRenderable WithAlpha(float newAlpha)

OpenRA.Game/Graphics/TargetLineRenderable.cs

@@ -35,7 +35,14 @@ public TargetLineRenderable(IEnumerable<WPos> waypoints, Color color, int width
 		public bool IsDecoration => true;
 
 		public IRenderable WithZOffset(int newOffset) { return new TargetLineRenderable(waypoints, color); }
-		public IRenderable OffsetBy(WVec vec) { return new TargetLineRenderable(waypoints.Select(w => w + vec), color); }
+
+		public IRenderable OffsetBy(in WVec vec)
+		{
+			// Lambdas can't use 'in' variables, so capture a copy for later
+			var offset = vec;
+			return new TargetLineRenderable(waypoints.Select(w => w + offset), color);
+		}
+
 		public IRenderable AsDecoration() { return this; }
 
 		public IFinalizedRenderable PrepareRender(WorldRenderer wr) { return this; }

OpenRA.Game/Graphics/UISpriteRenderable.cs

@@ -44,7 +44,7 @@ public UISpriteRenderable(Sprite sprite, WPos effectiveWorldPos, int2 screenPos,
 
 		public IPalettedRenderable WithPalette(PaletteReference newPalette) { return new UISpriteRenderable(sprite, effectiveWorldPos, screenPos, zOffset, newPalette, scale, alpha); }
 		public IRenderable WithZOffset(int newOffset) { return this; }
-		public IRenderable OffsetBy(WVec vec) { return this; }
+		public IRenderable OffsetBy(in WVec vec) { return this; }
 		public IRenderable AsDecoration() { return this; }
 
 		public IFinalizedRenderable PrepareRender(WorldRenderer wr) { return this; }

OpenRA.Game/Graphics/Vertex.cs

@@ -14,7 +14,7 @@
 namespace OpenRA.Graphics
 {
 	[StructLayout(LayoutKind.Sequential)]
-	public struct Vertex
+	public readonly struct Vertex
 	{
 		// 3d position
 		public readonly float X, Y, Z;

OpenRA.Game/Graphics/WorldRenderer.cs

@@ -373,7 +373,7 @@ public float3 Screen3DPxPosition(WPos pos)
 		}
 
 		// For scaling vectors to pixel sizes in the model renderer
-		public float3 ScreenVectorComponents(WVec vec)
+		public float3 ScreenVectorComponents(in WVec vec)
 		{
 			return new float3(
 				(float)TileSize.Width * vec.X / TileScale,
@@ -382,13 +382,13 @@ public float3 ScreenVectorComponents(WVec vec)
 		}
 
 		// For scaling vectors to pixel sizes in the model renderer
-		public float[] ScreenVector(WVec vec)
+		public float[] ScreenVector(in WVec vec)
 		{
 			var xyz = ScreenVectorComponents(vec);
 			return new[] { xyz.X, xyz.Y, xyz.Z, 1f };
 		}
 
-		public int2 ScreenPxOffset(WVec vec)
+		public int2 ScreenPxOffset(in WVec vec)
 		{
 			// Round to nearest pixel
 			var xyz = ScreenVectorComponents(vec);

OpenRA.Game/Input/Hotkey.cs

@@ -13,7 +13,7 @@
 
 namespace OpenRA
 {
-	public struct Hotkey : IEquatable<Hotkey>
+	public readonly struct Hotkey : IEquatable<Hotkey>
 	{
 		public static Hotkey Invalid = new Hotkey(Keycode.UNKNOWN, Modifiers.None);
 		public bool IsValid()

OpenRA.Game/MPos.cs

@@ -14,7 +14,7 @@
 
 namespace OpenRA
 {
-	public struct MPos : IEquatable<MPos>
+	public readonly struct MPos : IEquatable<MPos>
 	{
 		public readonly int U, V;
 
@@ -66,7 +66,7 @@ public CPos ToCPos(MapGridType gridType)
 	/// <summary>
 	/// Projected map position
 	/// </summary>
-	public struct PPos : IEquatable<PPos>
+	public readonly struct PPos : IEquatable<PPos>
 	{
 		public readonly int U, V;
 

OpenRA.Game/Map/Map.cs

@@ -24,7 +24,7 @@
 
 namespace OpenRA
 {
-	struct BinaryDataHeader
+	readonly struct BinaryDataHeader
 	{
 		public readonly byte Format;
 		public readonly uint TilesOffset;
@@ -1225,7 +1225,7 @@ public CPos ChooseRandomEdgeCell(MersenneTwister rand)
 			return AllEdgeCells.Random(rand);
 		}
 
-		public WDist DistanceToEdge(WPos pos, WVec dir)
+		public WDist DistanceToEdge(WPos pos, in WVec dir)
 		{
 			var projectedPos = pos - new WVec(0, pos.Z, pos.Z);
 			var x = dir.X == 0 ? int.MaxValue : ((dir.X < 0 ? ProjectedTopLeft.X : ProjectedBottomRight.X) - projectedPos.X) / dir.X;

OpenRA.Game/Map/MapCoordsRegion.cs

@@ -14,7 +14,7 @@
 
 namespace OpenRA
 {
-	public struct MapCoordsRegion : IEnumerable<MPos>
+	public readonly struct MapCoordsRegion : IEnumerable<MPos>
 	{
 		public struct MapCoordsEnumerator : IEnumerator<MPos>
 		{

OpenRA.Game/Map/MapGrid.cs

@@ -22,7 +22,7 @@ public enum MapGridType { Rectangular, RectangularIsometric }
 	public enum RampSplit { Flat, X, Y }
 	public enum RampCornerHeight { Low = 0, Half = 1, Full = 2 }
 
-	public struct CellRamp
+	public readonly struct CellRamp
 	{
 		public readonly int CenterHeightOffset;
 		public readonly WVec[] Corners;

OpenRA.Game/Map/TileReference.cs

@@ -11,7 +11,7 @@
 
 namespace OpenRA
 {
-	public struct TerrainTile
+	public readonly struct TerrainTile
 	{
 		public readonly ushort Type;
 		public readonly byte Index;
@@ -27,7 +27,7 @@ public TerrainTile(ushort type, byte index)
 		public override string ToString() { return Type + "," + Index; }
 	}
 
-	public struct ResourceTile
+	public readonly struct ResourceTile
 	{
 		public readonly byte Type;
 		public readonly byte Index;

OpenRA.Game/Primitives/ActionQueue.cs

@@ -65,7 +65,7 @@ int Index(DelayedAction action)
 		}
 	}
 
-	struct DelayedAction : IComparable<DelayedAction>
+	readonly struct DelayedAction : IComparable<DelayedAction>
 	{
 		public readonly long Time;
 		public readonly Action Action;

OpenRA.Game/Primitives/BitSet.cs

@@ -75,7 +75,7 @@ public static bool BitsContainString(BitSetIndex bits, string value)
 		}
 	}
 
-	public struct BitSet<T> : IEnumerable<string>, IEquatable<BitSet<T>> where T : class
+	public readonly struct BitSet<T> : IEnumerable<string>, IEquatable<BitSet<T>> where T : class
 	{
 		readonly BitSetIndex bits;
 

OpenRA.Game/Primitives/Color.cs

@@ -15,7 +15,7 @@
 
 namespace OpenRA.Primitives
 {
-	public struct Color : IEquatable<Color>, IScriptBindable
+	public readonly struct Color : IEquatable<Color>, IScriptBindable
 	{
 		readonly long argb;
 

OpenRA.Game/Primitives/Int32Matrix4x4.cs

@@ -13,7 +13,7 @@
 
 namespace OpenRA
 {
-	public struct Int32Matrix4x4 : IEquatable<Int32Matrix4x4>
+	public readonly struct Int32Matrix4x4 : IEquatable<Int32Matrix4x4>
 	{
 		public readonly int M11, M12, M13, M14, M21, M22, M23, M24, M31, M32, M33, M34, M41, M42, M43, M44;
 

OpenRA.Game/Primitives/LongBitSet.cs

@@ -92,7 +92,7 @@ public static void Reset()
 	}
 
 	// Opitmized BitSet to be used only when guaranteed to be no more than 64 values.
-	public struct LongBitSet<T> : IEnumerable<string>, IEquatable<LongBitSet<T>> where T : class
+	public readonly struct LongBitSet<T> : IEnumerable<string>, IEquatable<LongBitSet<T>> where T : class
 	{
 		readonly long bits;
 

OpenRA.Game/Primitives/PlayerDictionary.cs

@@ -17,7 +17,7 @@ namespace OpenRA.Primitives
 	/// <summary>
 	/// Provides a mapping of players to values, as well as fast lookup by player index.
 	/// </summary>
-	public struct PlayerDictionary<T> : IReadOnlyList<T>, IReadOnlyDictionary<Player, T> where T : class
+	public readonly struct PlayerDictionary<T> : IReadOnlyList<T>, IReadOnlyDictionary<Player, T> where T : class
 	{
 		readonly T[] valueByPlayerIndex;
 		readonly Dictionary<Player, T> valueByPlayer;

OpenRA.Game/Primitives/Polygon.cs

@@ -14,13 +14,13 @@
 
 namespace OpenRA.Primitives
 {
-	public struct Polygon
+	public readonly struct Polygon
 	{
 		public static readonly Polygon Empty = new Polygon(Rectangle.Empty);
 
 		public readonly Rectangle BoundingRect;
 		public readonly int2[] Vertices;
-		bool isRectangle;
+		readonly bool isRectangle;
 
 		public Polygon(Rectangle bounds)
 		{

OpenRA.Game/Primitives/Size.cs

@@ -13,7 +13,7 @@
 
 namespace OpenRA.Primitives
 {
-	public struct Size : IEquatable<Size>
+	public readonly struct Size : IEquatable<Size>
 	{
 		public readonly int Width;
 		public readonly int Height;

OpenRA.Game/Primitives/float2.cs

@@ -18,7 +18,7 @@ namespace OpenRA
 {
 	[SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:ElementMustBeginWithUpperCaseLetter", Justification = "Mimic a built-in type alias.")]
 	[StructLayout(LayoutKind.Sequential)]
-	public struct float2 : IEquatable<float2>
+	public readonly struct float2 : IEquatable<float2>
 	{
 		public readonly float X, Y;
 

OpenRA.Game/Primitives/int2.cs

@@ -16,7 +16,7 @@
 namespace OpenRA
 {
 	[SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:ElementMustBeginWithUpperCaseLetter", Justification = "Mimic a built-in type alias.")]
-	public struct int2 : IEquatable<int2>
+	public readonly struct int2 : IEquatable<int2>
 	{
 		public readonly int X, Y;
 		public int2(int x, int y) { X = x; Y = y; }

OpenRA.Game/SelectableExts.cs

@@ -73,7 +73,7 @@ public static FrozenActor WithHighestSelectionPriority(this IEnumerable<FrozenAc
 			return actors.MaxByOrDefault(a => CalculateActorSelectionPriority(a.Info, a.MouseBounds, selectionPixel, modifiers));
 		}
 
-		static long CalculateActorSelectionPriority(ActorInfo info, Polygon bounds, int2 selectionPixel, Modifiers modifiers)
+		static long CalculateActorSelectionPriority(ActorInfo info, in Polygon bounds, int2 selectionPixel, Modifiers modifiers)
 		{
 			if (bounds.IsEmpty)
 				return info.SelectionPriority(modifiers);

OpenRA.Game/Support/PerfSample.cs

@@ -14,7 +14,7 @@
 
 namespace OpenRA.Support
 {
-	public struct PerfSample : IDisposable
+	public readonly struct PerfSample : IDisposable
 	{
 		readonly string item;
 		readonly long ticks;

OpenRA.Game/Support/VariableExpression.cs

@@ -157,7 +157,7 @@ enum Precedence
 			Invalid = ~0
 		}
 
-		struct TokenTypeInfo
+		readonly struct TokenTypeInfo
 		{
 			public readonly string Symbol;
 			public readonly Precedence Precedence;

OpenRA.Game/TraitDictionary.cs

@@ -249,7 +249,7 @@ public IEnumerable<Actor> Actors(Func<T, bool> predicate)
 				}
 			}
 
-			struct AllEnumerable : IEnumerable<TraitPair<T>>
+			readonly struct AllEnumerable : IEnumerable<TraitPair<T>>
 			{
 				readonly TraitContainer<T> container;
 				public AllEnumerable(TraitContainer<T> container) { this.container = container; }

OpenRA.Game/Traits/World/ScreenMap.cs

@@ -18,7 +18,7 @@
 
 namespace OpenRA.Traits
 {
-	public struct ActorBoundsPair
+	public readonly struct ActorBoundsPair
 	{
 		public readonly Actor Actor;
 		public readonly Polygon Bounds;

OpenRA.Game/WAngle.cs

@@ -19,7 +19,7 @@ namespace OpenRA
 	/// <summary>
 	/// 1D angle - 1024 units = 360 degrees.
 	/// </summary>
-	public struct WAngle : IScriptBindable, ILuaAdditionBinding, ILuaSubtractionBinding, ILuaEqualityBinding, IEquatable<WAngle>
+	public readonly struct WAngle : IScriptBindable, ILuaAdditionBinding, ILuaSubtractionBinding, ILuaEqualityBinding, IEquatable<WAngle>
 	{
 		public readonly int Angle;
 		public int AngleSquared => (int)Angle * Angle;

OpenRA.Game/WDist.cs

@@ -21,7 +21,7 @@ namespace OpenRA
 	/// <summary>
 	/// 1d world distance - 1024 units = 1 cell.
 	/// </summary>
-	public struct WDist : IComparable, IComparable<WDist>, IEquatable<WDist>, IScriptBindable, ILuaAdditionBinding, ILuaSubtractionBinding, ILuaEqualityBinding, ILuaTableBinding
+	public readonly struct WDist : IComparable, IComparable<WDist>, IEquatable<WDist>, IScriptBindable, ILuaAdditionBinding, ILuaSubtractionBinding, ILuaEqualityBinding, ILuaTableBinding
 	{
 		public readonly int Length;
 		public long LengthSquared => (long)Length * Length;