diff --git a/OpenRa.FileFormats/Exts.cs b/OpenRa.FileFormats/Exts.cs new file mode 100644 index 0000000000..a2781f0318 --- /dev/null +++ b/OpenRa.FileFormats/Exts.cs @@ -0,0 +1,11 @@ + +namespace OpenRa.FileFormats +{ + public static class Exts + { + public static string F(this string fmt, params object[] args) + { + return string.Format(fmt, args); + } + } +} diff --git a/OpenRa.Game/GameRules/FieldLoader.cs b/OpenRa.FileFormats/FieldLoader.cs old mode 100755 new mode 100644 similarity index 91% rename from OpenRa.Game/GameRules/FieldLoader.cs rename to OpenRa.FileFormats/FieldLoader.cs index 919edd5d39..ccd4efd2ef --- a/OpenRa.Game/GameRules/FieldLoader.cs +++ b/OpenRa.FileFormats/FieldLoader.cs @@ -1,11 +1,9 @@ using System; using System.Linq; -using OpenRa.FileFormats; -using System.Collections.Generic; -namespace OpenRa.Game.GameRules +namespace OpenRa.FileFormats { - static class FieldLoader + public static class FieldLoader { public static void Load(object self, IniSection ini) { diff --git a/OpenRa.FileFormats/OpenRa.FileFormats.csproj b/OpenRa.FileFormats/OpenRa.FileFormats.csproj index 5c8fd2cd1b..7e9d06b0c7 100644 --- a/OpenRa.FileFormats/OpenRa.FileFormats.csproj +++ b/OpenRa.FileFormats/OpenRa.FileFormats.csproj @@ -48,6 +48,8 @@ + + diff --git a/OpenRa.Game/Chrome.cs b/OpenRa.Game/Chrome.cs index 596fcd6011..a5eca45aed 100644 --- a/OpenRa.Game/Chrome.cs +++ b/OpenRa.Game/Chrome.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; using IjwFramework.Types; -using OpenRa.Game.GameRules; +using OpenRa.FileFormats; using OpenRa.Game.Graphics; using OpenRa.Game.Orders; using OpenRa.Game.Support; diff --git a/OpenRa.Game/Effects/Corpse.cs b/OpenRa.Game/Effects/Corpse.cs index 2e89a40d7b..cfa253ccdf 100755 --- a/OpenRa.Game/Effects/Corpse.cs +++ b/OpenRa.Game/Effects/Corpse.cs @@ -1,7 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Collections.Generic; +using OpenRa.FileFormats; using OpenRa.Game.Graphics; using OpenRa.Game.Traits; diff --git a/OpenRa.Game/Exts.cs b/OpenRa.Game/Exts.cs index 25c746a325..179fd8e5a5 100644 --- a/OpenRa.Game/Exts.cs +++ b/OpenRa.Game/Exts.cs @@ -1,6 +1,4 @@ - -using System.Windows.Forms; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using OpenRa.Game.GameRules; using OpenRa.Game.Traits; @@ -9,11 +7,6 @@ namespace OpenRa.Game { static class Exts { - public static string F(this string fmt, params object[] args) - { - return string.Format(fmt, args); - } - public static bool HasModifier(this Modifiers k, Modifiers mod) { return (k & mod) == mod; diff --git a/OpenRa.Game/GameRules/Rules.cs b/OpenRa.Game/GameRules/Rules.cs index 8822a908bc..d3f741d546 100755 --- a/OpenRa.Game/GameRules/Rules.cs +++ b/OpenRa.Game/GameRules/Rules.cs @@ -4,7 +4,6 @@ using System.Linq; using IjwFramework.Types; using OpenRa.FileFormats; using OpenRa.Game.GameRules; -using OpenRa.Game.Traits; namespace OpenRa.Game { diff --git a/OpenRa.Game/OpenRa.Game.csproj b/OpenRa.Game/OpenRa.Game.csproj index 4bf279b6a5..08c2bf2686 100644 --- a/OpenRa.Game/OpenRa.Game.csproj +++ b/OpenRa.Game/OpenRa.Game.csproj @@ -153,7 +153,6 @@ - diff --git a/OpenRa.Game/Orders/UnitOrders.cs b/OpenRa.Game/Orders/UnitOrders.cs index 8426610329..791aa50d5c 100644 --- a/OpenRa.Game/Orders/UnitOrders.cs +++ b/OpenRa.Game/Orders/UnitOrders.cs @@ -1,4 +1,5 @@ using System.Drawing; +using OpenRa.FileFormats; using OpenRa.Game.GameRules; using OpenRa.Game.Graphics; using OpenRa.Game.Traits; diff --git a/OpenRa.Game/Sync.cs b/OpenRa.Game/Sync.cs index 607dc5a509..d7d4020888 100755 --- a/OpenRa.Game/Sync.cs +++ b/OpenRa.Game/Sync.cs @@ -1,10 +1,9 @@ using System; -using System.Collections.Generic; using System.Linq; -using System.Text; using System.Reflection; using System.Reflection.Emit; using IjwFramework.Collections; +using OpenRa.FileFormats; namespace OpenRa.Game {