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

Move MusicPlaylist to Mods.Common.

Browse Source
This commit is contained in:
Paul Chote
2015-08-01 22:50:43 +01:00
parent c6e246102e
commit 9b3ef9e7f7
5 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -181,7 +181,6 @@
<Compile Include="Traits\TraitsInterfaces.cs" /> <Compile Include="Traits\TraitsInterfaces.cs" />
<Compile Include="Traits\Util.cs" /> <Compile Include="Traits\Util.cs" />
<Compile Include="Traits\ValidateOrder.cs" /> <Compile Include="Traits\ValidateOrder.cs" />
<Compile Include="Traits\World\MusicPlaylist.cs" />
<Compile Include="Traits\World\Faction.cs" /> <Compile Include="Traits\World\Faction.cs" />
<Compile Include="Traits\World\ResourceType.cs" /> <Compile Include="Traits\World\ResourceType.cs" />
<Compile Include="Traits\World\ScreenShaker.cs" /> <Compile Include="Traits\World\ScreenShaker.cs" />

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

@@ -702,6 +702,7 @@
<Compile Include="Traits\RevealsShroud.cs" /> <Compile Include="Traits\RevealsShroud.cs" />
<Compile Include="Lint\CheckRevealFootprint.cs" /> <Compile Include="Lint\CheckRevealFootprint.cs" />
<Compile Include="Traits\ThrowsShrapnel.cs" /> <Compile Include="Traits\ThrowsShrapnel.cs" />
<Compile Include="Traits\World\MusicPlaylist.cs" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup> <PropertyGroup>

1
OpenRA.Mods.Common/Scripting/Global/MediaGlobal.cs
View File

@@ -17,6 +17,7 @@ using OpenRA.FileFormats;
using OpenRA.FileSystem; using OpenRA.FileSystem;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.Common.Effects; using OpenRA.Mods.Common.Effects;
using OpenRA.Mods.Common.Traits;
using OpenRA.Scripting; using OpenRA.Scripting;
using OpenRA.Traits; using OpenRA.Traits;

3
OpenRA.Game/Traits/World/MusicPlaylist.cs → OpenRA.Mods.Common/Traits/World/MusicPlaylist.cs
View File

@@ -11,8 +11,9 @@
using System; using System;
using System.Linq; using System.Linq;
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Traits;
namespace OpenRA.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("Trait for music handling. Attach this to the world actor.")] [Desc("Trait for music handling. Attach this to the world actor.")]
public class MusicPlaylistInfo : ITraitInfo public class MusicPlaylistInfo : ITraitInfo

2
OpenRA.Mods.Common/Widgets/Logic/MusicPlayerLogic.cs
View File

@@ -11,7 +11,7 @@
using System; using System;
using System.Linq; using System.Linq;
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Widgets; using OpenRA.Widgets;
namespace OpenRA.Mods.Common.Widgets.Logic namespace OpenRA.Mods.Common.Widgets.Logic