Merge pull request #4999 from Mailaender/start-game-notification

Moved StartGameNotification into its own trait
This commit is contained in:
Paul Chote
2014-04-21 01:32:29 +12:00
9 changed files with 50 additions and 13 deletions

View File

@@ -1,6 +1,6 @@
#region Copyright & License Information
/*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
* Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
@@ -22,17 +22,16 @@ namespace OpenRA.Mods.RA
class ActorLostNotification : INotifyKilled
{
ActorLostNotificationInfo Info;
ActorLostNotificationInfo info;
public ActorLostNotification(ActorLostNotificationInfo info)
{
Info = info;
this.info = info;
}
public void Killed(Actor self, AttackInfo e)
{
var player = (Info.NotifyAll) ? self.World.LocalPlayer : self.Owner;
Sound.PlayNotification(player, "Speech", Info.Notification, self.Owner.Country.Race);
var player = (info.NotifyAll) ? self.World.LocalPlayer : self.Owner;
Sound.PlayNotification(player, "Speech", info.Notification, self.Owner.Country.Race);
}
}
}

View File

@@ -496,6 +496,7 @@
<Compile Include="Buildings\LineBuildNode.cs" />
<Compile Include="ModChooserLoadScreen.cs" />
<Compile Include="Render\WithBuildingPlacedAnimation.cs" />
<Compile Include="StartGameNotification.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">

View File

@@ -0,0 +1,36 @@
#region Copyright & License Information
/*
* Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
{
class StartGameNotificationInfo : ITraitInfo
{
public readonly string Notification = "StartGame";
public object Create(ActorInitializer init) { return new StartGameNotification(this); }
}
class StartGameNotification : IWorldLoaded
{
StartGameNotificationInfo info;
public StartGameNotification(StartGameNotificationInfo info)
{
this.info = info;
}
public void WorldLoaded(World w, WorldRenderer wr)
{
Sound.PlayNotification(null, "Speech", info.Notification, null);
}
}
}