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

more

Browse Source
This commit is contained in:
Chris Forbes
2010-01-11 22:15:54 +13:00
parent 889828aa02
commit 9c520e07b1
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRa.Game/Orders/ChronosphereSelectOrderGenerator.cs
View File

@@ -31,11 +31,9 @@ namespace OpenRa.Game.Orders
var underCursor = Game.FindUnits(loc, loc) var underCursor = Game.FindUnits(loc, loc)
.Where(a => a.Owner == Game.LocalPlayer .Where(a => a.Owner == Game.LocalPlayer
&& a.traits.WithInterface<Chronoshiftable>().Any() && a.traits.WithInterface<Chronoshiftable>().Any()
&& a.LegacyInfo.Selectable).FirstOrDefault(); && a.traits.Contains<Selectable>()).FirstOrDefault();
var unit = underCursor != null ? underCursor.LegacyInfo as LegacyUnitInfo : null; if (underCursor != null)
if (unit != null)
yield return new Order("ChronosphereSelect", underCursor, null, int2.Zero, power.Name); yield return new Order("ChronosphereSelect", underCursor, null, int2.Zero, power.Name);
} }
} }

6
OpenRa.Game/Orders/IronCurtainOrderGenerator.cs
View File

@@ -31,11 +31,9 @@ namespace OpenRa.Game.Orders
var underCursor = Game.FindUnits(loc, loc) var underCursor = Game.FindUnits(loc, loc)
.Where(a => a.Owner == Game.LocalPlayer .Where(a => a.Owner == Game.LocalPlayer
&& a.traits.Contains<IronCurtainable>() && a.traits.Contains<IronCurtainable>()
&& a.LegacyInfo.Selectable).FirstOrDefault(); && a.traits.Contains<Selectable>()).FirstOrDefault();
var unit = underCursor != null ? underCursor.LegacyInfo as LegacyUnitInfo : null; if (underCursor != null)
if (unit != null)
yield return new Order("IronCurtain", underCursor, null, int2.Zero, power.Name); yield return new Order("IronCurtain", underCursor, null, int2.Zero, power.Name);
} }
} }

3
OpenRa.Game/Sound.cs
View File

@@ -2,6 +2,7 @@
using IrrKlang; using IrrKlang;
using OpenRa.FileFormats; using OpenRa.FileFormats;
using OpenRa.Game.GameRules; using OpenRa.Game.GameRules;
using OpenRa.Game.Traits;
namespace OpenRa.Game namespace OpenRa.Game
{ {
@@ -92,7 +93,7 @@ namespace OpenRa.Game
{ {
if (voicedUnit == null) return; if (voicedUnit == null) return;
var mi = voicedUnit.LegacyInfo as LegacyMobileInfo; var mi = voicedUnit.Info.Traits.GetOrDefault<SelectableInfo>();
if (mi == null) return; if (mi == null) return;
var vi = Rules.VoiceInfo[mi.Voice]; var vi = Rules.VoiceInfo[mi.Voice];