This commit is contained in:
Chris Forbes
2009-12-28 09:33:56 +13:00
parent bf0d44851f
commit 5e21f6393b
7 changed files with 8 additions and 16 deletions

View File

@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using OpenRa.Game.GameRules; using OpenRa.Game.GameRules;
using OpenRa.Game.Graphics;
using OpenRa.Game.Traits; using OpenRa.Game.Traits;
using OpenRa.Game.Traits.Activities; using OpenRa.Game.Traits.Activities;

View File

@@ -1,12 +1,11 @@
using System.Collections.Generic; using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Windows.Forms; using IjwFramework.Collections;
using IjwFramework.Types; using IjwFramework.Types;
using OpenRa.Game.GameRules; using OpenRa.Game.GameRules;
using OpenRa.Game.Graphics; using OpenRa.Game.Graphics;
using OpenRa.Game.Traits; using OpenRa.Game.Traits;
using IjwFramework.Collections;
using System;
namespace OpenRa.Game namespace OpenRa.Game
{ {

View File

@@ -1,9 +1,8 @@
using System; using System;
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.Graphics; using OpenRa.Game.Graphics;
using OpenRa.Game.Traits;
namespace OpenRa.Game namespace OpenRa.Game
{ {

View File

@@ -1,5 +1,5 @@
 using OpenRa.Game.GameRules;
using OpenRa.Game.GameRules;
namespace OpenRa.Game namespace OpenRa.Game
{ {
static class Smudge static class Smudge

View File

@@ -1,5 +1,4 @@
using System.Drawing; using System.Drawing;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRa.Game.GameRules; using OpenRa.Game.GameRules;
using OpenRa.Game.Graphics; using OpenRa.Game.Graphics;

View File

@@ -1,7 +1,7 @@
using System; using System;
using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Collections.Generic;
using OpenRa.Game.Traits; using OpenRa.Game.Traits;
namespace OpenRa.Game namespace OpenRa.Game
@@ -22,7 +22,7 @@ namespace OpenRa.Game
public void Tick() public void Tick()
{ {
// Does this belong here? // Does this belong here? NO, but it's your mess.
// Get the crushable actors // Get the crushable actors
foreach (var a in Game.world.Actors.Where(b => b.traits.WithInterface<ICrushable>().Any())) foreach (var a in Game.world.Actors.Where(b => b.traits.WithInterface<ICrushable>().Any()))
@@ -39,9 +39,7 @@ namespace OpenRa.Game
Log.Write("{0} crushes {1}", crusher.Info.Name, a.Info.Name); Log.Write("{0} crushes {1}", crusher.Info.Name, a.Info.Name);
// Apply the crush action // Apply the crush action
foreach (var crush in a.traits.WithInterface<ICrushable>()) foreach (var crush in a.traits.WithInterface<ICrushable>())
{
crush.OnCrush(crusher); crush.OnCrush(crusher);
}
} }
} }
} }

View File

@@ -1,7 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using OpenRa.Game.Graphics;
using OpenRa.Game.Traits;
using OpenRa.Game.Effects; using OpenRa.Game.Effects;
namespace OpenRa.Game namespace OpenRa.Game