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

Renames RallyPoint effect to RallyPointIndicator

Browse Source
This commit is contained in:
reaperrr
2014-12-10 19:55:56 +01:00
parent ffca040c47
commit aadceb085b
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Effects/RallyPoint.cs → OpenRA.Mods.Common/Effects/RallyPointIndicator.cs
View File

@@ -16,20 +16,20 @@ using OpenRA.Mods.Common.Traits;
namespace OpenRA.Mods.Common.Effects namespace OpenRA.Mods.Common.Effects
{ {
class RallyPoint : IEffect class RallyPointIndicator : IEffect
{ {
readonly Actor building; readonly Actor building;
readonly Common.Traits.RallyPoint rp; readonly RallyPoint rp;
readonly string palettePrefix; readonly string palettePrefix;
readonly Animation flag; readonly Animation flag;
readonly Animation circles; readonly Animation circles;
public RallyPoint(Actor building, string palettePrefix) public RallyPointIndicator(Actor building, string palettePrefix)
{ {
this.building = building; this.building = building;
this.palettePrefix = palettePrefix; this.palettePrefix = palettePrefix;
rp = building.Trait<Common.Traits.RallyPoint>(); rp = building.Trait<RallyPoint>();
flag = new Animation(building.World, "rallypoint"); flag = new Animation(building.World, "rallypoint");
circles = new Animation(building.World, "rallypoint"); circles = new Animation(building.World, "rallypoint");

4
OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
View File

@@ -63,7 +63,7 @@
<Compile Include="Effects\Missile.cs" /> <Compile Include="Effects\Missile.cs" />
<Compile Include="Effects\NukeLaunch.cs" /> <Compile Include="Effects\NukeLaunch.cs" />
<Compile Include="Effects\PowerdownIndicator.cs" /> <Compile Include="Effects\PowerdownIndicator.cs" />
<Compile Include="Effects\RallyPoint.cs" /> <Compile Include="Effects\RallyPointIndicator.cs" />
<Compile Include="Effects\Smoke.cs" /> <Compile Include="Effects\Smoke.cs" />
<Compile Include="Commands\ChatCommands.cs" /> <Compile Include="Commands\ChatCommands.cs" />
<Compile Include="Commands\DevCommands.cs" /> <Compile Include="Commands\DevCommands.cs" />
@@ -109,6 +109,7 @@
<Compile Include="Traits\BlocksBullets.cs" /> <Compile Include="Traits\BlocksBullets.cs" />
<Compile Include="Traits\Buildable.cs" /> <Compile Include="Traits\Buildable.cs" />
<Compile Include="Traits\Buildings\DeadBuildingState.cs" /> <Compile Include="Traits\Buildings\DeadBuildingState.cs" />
<Compile Include="Traits\Buildings\RallyPoint.cs" />
<Compile Include="Traits\Burns.cs" /> <Compile Include="Traits\Burns.cs" />
<Compile Include="Traits\CustomBuildTimeValue.cs" /> <Compile Include="Traits\CustomBuildTimeValue.cs" />
<Compile Include="Traits\CustomSellValue.cs" /> <Compile Include="Traits\CustomSellValue.cs" />
@@ -137,7 +138,6 @@
<Compile Include="Traits\Power\RequiresPower.cs" /> <Compile Include="Traits\Power\RequiresPower.cs" />
<Compile Include="Traits\Power\ScalePowerWithHealth.cs" /> <Compile Include="Traits\Power\ScalePowerWithHealth.cs" />
<Compile Include="Traits\ProvidesRadar.cs" /> <Compile Include="Traits\ProvidesRadar.cs" />
<Compile Include="Traits\RallyPoint.cs" />
<Compile Include="Traits\Render\RenderEditorOnly.cs" /> <Compile Include="Traits\Render\RenderEditorOnly.cs" />
<Compile Include="Traits\Render\RenderFlare.cs" /> <Compile Include="Traits\Render\RenderFlare.cs" />
<Compile Include="Traits\Render\RenderNameTag.cs" /> <Compile Include="Traits\Render\RenderNameTag.cs" />

3
OpenRA.Mods.Common/Traits/RallyPoint.cs → OpenRA.Mods.Common/Traits/Buildings/RallyPoint.cs
View File

@@ -9,6 +9,7 @@
#endregion #endregion
using System.Collections.Generic; using System.Collections.Generic;
using OpenRA.Mods.Common.Effects;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits namespace OpenRA.Mods.Common.Traits
@@ -29,7 +30,7 @@ namespace OpenRA.Mods.Common.Traits
public RallyPoint(Actor self, RallyPointInfo info) public RallyPoint(Actor self, RallyPointInfo info)
{ {
Location = self.Location + info.RallyPoint; Location = self.Location + info.RallyPoint;
self.World.AddFrameEndTask(w => w.Add(new Effects.RallyPoint(self, info.IndicatorPalettePrefix))); self.World.AddFrameEndTask(w => w.Add(new RallyPointIndicator(self, info.IndicatorPalettePrefix)));
} }
public IEnumerable<IOrderTargeter> Orders public IEnumerable<IOrderTargeter> Orders