This commit is contained in:
Matthias Mailänder
2014-04-20 15:26:33 +02:00
parent a8a3036bc4
commit f19fbb1794
2 changed files with 9 additions and 10 deletions

View File

@@ -26,12 +26,12 @@ namespace OpenRA.GameRules
public readonly string[] DisableVariants = { };
public readonly string[] DisablePrefixes = { };
static Dictionary<string, string[]> Load( MiniYaml y, string name )
static Dictionary<string, string[]> Load(MiniYaml y, string name)
{
return y.NodesDict.ContainsKey( name )
? y.NodesDict[ name ].NodesDict.ToDictionary(
return y.NodesDict.ContainsKey(name)
? y.NodesDict[name].NodesDict.ToDictionary(
a => a.Key,
a => FieldLoader.GetValue<string[]>( "(value)", a.Value.Value ) )
a => FieldLoader.GetValue<string[]>("(value)", a.Value.Value))
: new Dictionary<string, string[]>();
}

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);
}
}
}