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

Merge pull request #9542 from reaperrr/WithRotorOverlay

Browse Source 
Rename WithRotor to WithSpriteRotorOverlay
This commit is contained in:
abcdefg30
2015-10-04 20:50:59 +02:00
parent 1a8ec3745b b722aa6721
commit e5dca60f5c
7 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -441,7 +441,7 @@
<Compile Include="Traits\Render\WithRepairAnimation.cs" />
<Compile Include="Traits\Render\WithRepairOverlay.cs" />
<Compile Include="Traits\Render\WithResources.cs" />
<Compile Include="Traits\Render\WithRotor.cs" />
<Compile Include="Traits\Render\WithSpriteRotorOverlay.cs" />
<Compile Include="Traits\Render\WithShadow.cs" />
<Compile Include="Traits\Render\WithSmoke.cs" />
<Compile Include="Traits\Render\WithSpriteBody.cs" />

10
OpenRA.Mods.Common/Traits/Render/WithRotor.cs → OpenRA.Mods.Common/Traits/Render/WithSpriteRotorOverlay.cs
View File

@@ -17,7 +17,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("Displays a helicopter rotor overlay.")]
public class WithRotorInfo : ITraitInfo, IRenderActorPreviewSpritesInfo, Requires<RenderSpritesInfo>, Requires<BodyOrientationInfo>
public class WithSpriteRotorOverlayInfo : ITraitInfo, IRenderActorPreviewSpritesInfo, Requires<RenderSpritesInfo>, Requires<BodyOrientationInfo>
{
[Desc("Sequence name to use when flying")]
[SequenceReference] public readonly string Sequence = "rotor";
@@ -28,7 +28,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Position relative to body")]
public readonly WVec Offset = WVec.Zero;
public object Create(ActorInitializer init) { return new WithRotor(init.Self, this); }
public object Create(ActorInitializer init) { return new WithSpriteRotorOverlay(init.Self, this); }
public IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
{
@@ -43,13 +43,13 @@ namespace OpenRA.Mods.Common.Traits
}
}
public class WithRotor : ITick
public class WithSpriteRotorOverlay : ITick
{
readonly WithRotorInfo info;
readonly WithSpriteRotorOverlayInfo info;
readonly Animation rotorAnim;
readonly IMove movement;
public WithRotor(Actor self, WithRotorInfo info)
public WithSpriteRotorOverlay(Actor self, WithSpriteRotorOverlayInfo info)
{
this.info = info;
var rs = self.Trait<RenderSprites>();

9
OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
View File

@@ -2189,6 +2189,15 @@ namespace OpenRA.Mods.Common.UtilityCommands
}
}
if (engineVersion < 20151004)
{
if (depth == 1 && node.Key == "WithRotor")
node.Key = "WithSpriteRotorOverlay";
if (depth == 1 && node.Key == "-WithRotor")
node.Key = "-WithSpriteRotorOverlay";
}
UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1);
}
}