epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove spurious IProducer interface; add IBlocksBullets and move Wall

Browse Source
This commit is contained in:
Chris Forbes
2010-05-23 16:24:28 +12:00
parent 224489502e
commit 431bbe2764
8 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Effects/Bullet.cs
View File

@@ -101,7 +101,7 @@ namespace OpenRA.Effects
var cell = ((1f/Game.CellSize) * pos).ToInt2();
if (world.WorldActor.traits.Get<UnitInfluence>().GetUnitsAt(cell).Any(
a => a.traits.Contains<Wall>()))
a => a.traits.Contains<IBlocksBullets>()))
{
Args.dest = pos.ToInt2();
Explode(world);

2
OpenRA.Game/Effects/Missile.cs
View File

@@ -116,7 +116,7 @@ namespace OpenRA.Effects
var cell = ((1f / Game.CellSize) * Pos).ToInt2();
if (world.WorldActor.traits.Get<UnitInfluence>().GetUnitsAt(cell).Any(
a => a.traits.Contains<Wall>()))
a => a.traits.Contains<IBlocksBullets>()))
Explode(world);
}
}

1
OpenRA.Game/OpenRA.Game.csproj
View File

@@ -215,7 +215,6 @@
<Compile Include="Widgets\WorldTooltipWidget.cs" />
<Compile Include="World.cs" />
<Compile Include="WorldUtils.cs" />
<Compile Include="Traits\Wall.cs" />
<Compile Include="Traits\Player\EvaAlerts.cs" />
<Compile Include="Traits\World\ScreenShaker.cs" />
<Compile Include="Traits\LineBuild.cs" />

2
OpenRA.Game/Traits/Player/ProductionQueue.cs
View File

@@ -193,7 +193,7 @@ namespace OpenRA.Traits
return;
}
if( producer.traits.WithInterface<IProducer>().Any( p => p.Produce( producer, newUnitType ) ) )
if( producer.traits.WithInterface<Production>().Any( p => p.Produce( producer, newUnitType ) ) )
FinishProduction( newUnitType.Category );
}
}

2
OpenRA.Game/Traits/Production.cs
View File

@@ -34,7 +34,7 @@ namespace OpenRA.Traits
public virtual object Create(Actor self) { return new Production(self); }
}
public class Production : IIssueOrder, IResolveOrder, IProducer, ITags
public class Production : IIssueOrder, IResolveOrder, ITags
{
bool isPrimary = false;
public bool IsPrimary { get { return isPrimary; } }

6
OpenRA.Game/Traits/TraitsInterfaces.cs
View File

@@ -62,11 +62,6 @@ namespace OpenRA.Traits
public interface IDisable { bool Disabled { get; } }
interface IProducer
{
bool Produce( Actor self, ActorInfo producee );
void SetPrimaryProducer(Actor self, bool isPrimary);
}
public interface IOccupySpace { IEnumerable<int2> OccupiedCells(); }
public interface INotifyAttack { void Attacking(Actor self); }
public interface IRenderModifier { IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r); }
@@ -144,4 +139,5 @@ namespace OpenRA.Traits
public interface INotifyIdle { void Idle(Actor self); }
public interface IVictoryConditions { bool HasLost { get; } bool HasWon { get; } }
public interface IBlocksBullets { }
}

1
OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
View File

@@ -173,6 +173,7 @@
<Compile Include="ThrowsParticles.cs" />
<Compile Include="TraitsInterfaces.cs" />
<Compile Include="DefaultShellmapScript.cs" />
<Compile Include="Wall.cs" />
<Compile Include="WaterPaletteRotation.cs" />
<Compile Include="WithMuzzleFlash.cs" />
<Compile Include="WithShadow.cs" />

5
OpenRA.Game/Traits/Wall.cs → OpenRA.Mods.RA/Wall.cs
View File

@@ -21,8 +21,9 @@
using System.Collections.Generic;
using System.Linq;
using OpenRA.GameRules;
using OpenRA.Traits;
namespace OpenRA.Traits
namespace OpenRA.Mods.RA
{
public class WallInfo : ITraitInfo
{
@@ -31,7 +32,7 @@ namespace OpenRA.Traits
public object Create(Actor self) { return new Wall(self); }
}
public class Wall : ICrushable, IOccupySpace
public class Wall : ICrushable, IOccupySpace, IBlocksBullets
{
readonly Actor self;
public Wall(Actor self)