From c2279d30711c9bf6e0d5302eaa72d96be79289e2 Mon Sep 17 00:00:00 2001 From: teinarss Date: Sun, 28 Feb 2021 18:07:35 +0100 Subject: [PATCH] Change GetField calls to use nameof --- OpenRA.Game/GameRules/ActorInfo.cs | 2 +- OpenRA.Game/Map/ActorInitializer.cs | 8 ++++---- OpenRA.Mods.Common/ActorInitializer.cs | 4 ++-- OpenRA.Mods.Common/Terrain/DefaultTerrain.cs | 6 +++--- OpenRA.Mods.Common/Terrain/TerrainInfo.cs | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/OpenRA.Game/GameRules/ActorInfo.cs b/OpenRA.Game/GameRules/ActorInfo.cs index 34747f1325..6d3856563f 100644 --- a/OpenRA.Game/GameRules/ActorInfo.cs +++ b/OpenRA.Game/GameRules/ActorInfo.cs @@ -89,7 +89,7 @@ namespace OpenRA try { if (traitInstance.Length > 1) - info.GetType().GetField("InstanceName").SetValue(info, traitInstance[1]); + info.GetType().GetField(nameof(info.InstanceName)).SetValue(info, traitInstance[1]); FieldLoader.Load(info, my); } diff --git a/OpenRA.Game/Map/ActorInitializer.cs b/OpenRA.Game/Map/ActorInitializer.cs index 20b3dadac6..ffe7f523a5 100644 --- a/OpenRA.Game/Map/ActorInitializer.cs +++ b/OpenRA.Game/Map/ActorInitializer.cs @@ -154,12 +154,12 @@ namespace OpenRA public virtual void Initialize(MiniYaml yaml) { - Initialize((T)FieldLoader.GetValue("value", typeof(T), yaml.Value)); + Initialize((T)FieldLoader.GetValue(nameof(value), typeof(T), yaml.Value)); } public virtual void Initialize(T value) { - var field = GetType().GetField("value", BindingFlags.NonPublic | BindingFlags.Instance); + var field = GetType().GetField(nameof(value), BindingFlags.NonPublic | BindingFlags.Instance); if (field != null) field.SetValue(this, value); } @@ -246,14 +246,14 @@ namespace OpenRA public void Initialize(MiniYaml yaml) { - var field = GetType().GetField("InternalName", BindingFlags.Public | BindingFlags.Instance); + var field = GetType().GetField(nameof(InternalName), BindingFlags.Public | BindingFlags.Instance); if (field != null) field.SetValue(this, yaml.Value); } public void Initialize(Player player) { - var field = GetType().GetField("value", BindingFlags.NonPublic | BindingFlags.Instance); + var field = GetType().GetField(nameof(value), BindingFlags.NonPublic | BindingFlags.Instance); if (field != null) field.SetValue(this, player); } diff --git a/OpenRA.Mods.Common/ActorInitializer.cs b/OpenRA.Mods.Common/ActorInitializer.cs index c9090c8f6d..03290c9dc3 100644 --- a/OpenRA.Mods.Common/ActorInitializer.cs +++ b/OpenRA.Mods.Common/ActorInitializer.cs @@ -48,12 +48,12 @@ namespace OpenRA.Mods.Common public void Initialize(MiniYaml yaml) { - Initialize((int)FieldLoader.GetValue("value", typeof(int), yaml.Value)); + Initialize((int)FieldLoader.GetValue(nameof(value), typeof(int), yaml.Value)); } public void Initialize(int value) { - var field = GetType().GetField("value", BindingFlags.NonPublic | BindingFlags.Instance); + var field = GetType().GetField(nameof(value), BindingFlags.NonPublic | BindingFlags.Instance); if (field != null) field.SetValue(this, value); } diff --git a/OpenRA.Mods.Common/Terrain/DefaultTerrain.cs b/OpenRA.Mods.Common/Terrain/DefaultTerrain.cs index e6155b6ce1..3bb33061d0 100644 --- a/OpenRA.Mods.Common/Terrain/DefaultTerrain.cs +++ b/OpenRA.Mods.Common/Terrain/DefaultTerrain.cs @@ -50,15 +50,15 @@ namespace OpenRA.Mods.Common.Terrain FieldLoader.Load(tile, my); // Terrain type must be converted from a string to an index - tile.GetType().GetField("TerrainType").SetValue(tile, terrainInfo.GetTerrainIndex(my.Value)); + tile.GetType().GetField(nameof(tile.TerrainType)).SetValue(tile, terrainInfo.GetTerrainIndex(my.Value)); // Fall back to the terrain-type color if necessary var overrideColor = terrainInfo.TerrainTypes[tile.TerrainType].Color; if (tile.MinColor == default) - tile.GetType().GetField("MinColor").SetValue(tile, overrideColor); + tile.GetType().GetField(nameof(tile.MinColor)).SetValue(tile, overrideColor); if (tile.MaxColor == default) - tile.GetType().GetField("MaxColor").SetValue(tile, overrideColor); + tile.GetType().GetField(nameof(tile.MaxColor)).SetValue(tile, overrideColor); return tile; } diff --git a/OpenRA.Mods.Common/Terrain/TerrainInfo.cs b/OpenRA.Mods.Common/Terrain/TerrainInfo.cs index e4089dde5d..d52909436c 100644 --- a/OpenRA.Mods.Common/Terrain/TerrainInfo.cs +++ b/OpenRA.Mods.Common/Terrain/TerrainInfo.cs @@ -75,15 +75,15 @@ namespace OpenRA.Mods.Common.Terrain FieldLoader.Load(tile, my); // Terrain type must be converted from a string to an index - tile.GetType().GetField("TerrainType").SetValue(tile, terrainInfo.GetTerrainIndex(my.Value)); + tile.GetType().GetField(nameof(tile.TerrainType)).SetValue(tile, terrainInfo.GetTerrainIndex(my.Value)); // Fall back to the terrain-type color if necessary var overrideColor = terrainInfo.TerrainTypes[tile.TerrainType].Color; if (tile.MinColor == default) - tile.GetType().GetField("MinColor").SetValue(tile, overrideColor); + tile.GetType().GetField(nameof(tile.MinColor)).SetValue(tile, overrideColor); if (tile.MaxColor == default) - tile.GetType().GetField("MaxColor").SetValue(tile, overrideColor); + tile.GetType().GetField(nameof(tile.MaxColor)).SetValue(tile, overrideColor); return tile; }