move AttackPopupTurreted into RA where it can be fixed.

This commit is contained in:
Chris Forbes
2011-08-21 21:05:22 +12:00
parent 6daeb73471
commit 05d1c8ee82
3 changed files with 13 additions and 20 deletions

View File

@@ -68,7 +68,6 @@
<Compile Include="Activities\HarvesterDockSequence.cs" /> <Compile Include="Activities\HarvesterDockSequence.cs" />
<Compile Include="TiberiumRefinery.cs" /> <Compile Include="TiberiumRefinery.cs" />
<Compile Include="CncWaterPaletteRotation.cs" /> <Compile Include="CncWaterPaletteRotation.cs" />
<Compile Include="AttackPopupTurreted.cs" />
<Compile Include="SpawnViceroid.cs" /> <Compile Include="SpawnViceroid.cs" />
<Compile Include="Widgets\Logic\CncMenuLogic.cs" /> <Compile Include="Widgets\Logic\CncMenuLogic.cs" />
<Compile Include="Widgets\Logic\CncServerBrowserLogic.cs" /> <Compile Include="Widgets\Logic\CncServerBrowserLogic.cs" />

View File

@@ -11,7 +11,6 @@
using System; using System;
using System.Linq; using System.Linq;
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Mods.RA;
using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Buildings; using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Move; using OpenRA.Mods.RA.Move;
@@ -19,7 +18,7 @@ using OpenRA.Mods.RA.Render;
using OpenRA.Traits; using OpenRA.Traits;
using OpenRA.Traits.Activities; using OpenRA.Traits.Activities;
namespace OpenRA.Mods.Cnc namespace OpenRA.Mods.RA
{ {
class AttackPopupTurretedInfo : AttackBaseInfo class AttackPopupTurretedInfo : AttackBaseInfo
{ {
@@ -31,13 +30,7 @@ namespace OpenRA.Mods.Cnc
class AttackPopupTurreted : AttackBase, INotifyBuildComplete, INotifyIdle, IDamageModifier class AttackPopupTurreted : AttackBase, INotifyBuildComplete, INotifyIdle, IDamageModifier
{ {
enum PopupState enum PopupState { Open, Rotating, Transitioning, Closed };
{
Open,
Rotating,
Transitioning,
Closed
};
protected Target target; protected Target target;
AttackPopupTurretedInfo Info; AttackPopupTurretedInfo Info;

View File

@@ -359,6 +359,7 @@
<Compile Include="ThrowsParticle.cs" /> <Compile Include="ThrowsParticle.cs" />
<Compile Include="Crates\HideMapCrateAction.cs" /> <Compile Include="Crates\HideMapCrateAction.cs" />
<Compile Include="World\PlayMusicOnMapLoad.cs" /> <Compile Include="World\PlayMusicOnMapLoad.cs" />
<Compile Include="AttackPopupTurreted.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj"> <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">