moved FieldLoader and .F() ext into OpenRa.FileFormats

This commit is contained in:
Chris Forbes
2010-01-14 19:15:22 +13:00
parent 8e86ce6d4a
commit 614edbdc65
10 changed files with 21 additions and 21 deletions

View File

@@ -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);
}
}
}

View File

@@ -1,11 +1,9 @@
using System; using System;
using System.Linq; 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) public static void Load(object self, IniSection ini)
{ {

View File

@@ -48,6 +48,8 @@
<Compile Include="Blowfish.cs" /> <Compile Include="Blowfish.cs" />
<Compile Include="BlowfishKeyProvider.cs" /> <Compile Include="BlowfishKeyProvider.cs" />
<Compile Include="Dune2ShpReader.cs" /> <Compile Include="Dune2ShpReader.cs" />
<Compile Include="Exts.cs" />
<Compile Include="FieldLoader.cs" />
<Compile Include="FileSystem.cs" /> <Compile Include="FileSystem.cs" />
<Compile Include="Folder.cs" /> <Compile Include="Folder.cs" />
<Compile Include="Format2.cs" /> <Compile Include="Format2.cs" />

View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using IjwFramework.Types; using IjwFramework.Types;
using OpenRa.Game.GameRules; using OpenRa.FileFormats;
using OpenRa.Game.Graphics; using OpenRa.Game.Graphics;
using OpenRa.Game.Orders; using OpenRa.Game.Orders;
using OpenRa.Game.Support; using OpenRa.Game.Support;

View File

@@ -1,7 +1,5 @@
using System; using System.Collections.Generic;
using System.Collections.Generic; using OpenRa.FileFormats;
using System.Linq;
using System.Text;
using OpenRa.Game.Graphics; using OpenRa.Game.Graphics;
using OpenRa.Game.Traits; using OpenRa.Game.Traits;

View File

@@ -1,6 +1,4 @@
 using System.Collections.Generic;
using System.Windows.Forms;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRa.Game.GameRules; using OpenRa.Game.GameRules;
using OpenRa.Game.Traits; using OpenRa.Game.Traits;
@@ -9,11 +7,6 @@ namespace OpenRa.Game
{ {
static class Exts 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) public static bool HasModifier(this Modifiers k, Modifiers mod)
{ {
return (k & mod) == mod; return (k & mod) == mod;

View File

@@ -4,7 +4,6 @@ using System.Linq;
using IjwFramework.Types; using IjwFramework.Types;
using OpenRa.FileFormats; using OpenRa.FileFormats;
using OpenRa.Game.GameRules; using OpenRa.Game.GameRules;
using OpenRa.Game.Traits;
namespace OpenRa.Game namespace OpenRa.Game
{ {

View File

@@ -153,7 +153,6 @@
<Compile Include="Controller.cs" /> <Compile Include="Controller.cs" />
<Compile Include="Cursor.cs" /> <Compile Include="Cursor.cs" />
<Compile Include="Effects\Explosion.cs" /> <Compile Include="Effects\Explosion.cs" />
<Compile Include="GameRules\FieldLoader.cs" />
<Compile Include="GameRules\Footprint.cs" /> <Compile Include="GameRules\Footprint.cs" />
<Compile Include="GameRules\InfoLoader.cs" /> <Compile Include="GameRules\InfoLoader.cs" />
<Compile Include="GameRules\ProjectileInfo.cs" /> <Compile Include="GameRules\ProjectileInfo.cs" />

View File

@@ -1,4 +1,5 @@
using System.Drawing; using System.Drawing;
using OpenRa.FileFormats;
using OpenRa.Game.GameRules; using OpenRa.Game.GameRules;
using OpenRa.Game.Graphics; using OpenRa.Game.Graphics;
using OpenRa.Game.Traits; using OpenRa.Game.Traits;

View File

@@ -1,10 +1,9 @@
using System; using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
using System.Reflection; using System.Reflection;
using System.Reflection.Emit; using System.Reflection.Emit;
using IjwFramework.Collections; using IjwFramework.Collections;
using OpenRa.FileFormats;
namespace OpenRa.Game namespace OpenRa.Game
{ {