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

Final style & rebase fixes

Browse Source
This commit is contained in:
Pavlos Touboulidis
2014-05-15 04:12:29 +03:00
parent df6159f12b
commit f651cb3677
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenRA.Game/GameRules/Ruleset.cs
View File

@@ -37,14 +37,14 @@ namespace OpenRA
IDictionary<string, TileSet> tileSets, IDictionary<string, TileSet> tileSets,
IDictionary<string, SequenceProvider> sequences) IDictionary<string, SequenceProvider> sequences)
{ {
this.Actors = new ReadOnlyDictionary<string, ActorInfo>(actors); Actors = new ReadOnlyDictionary<string, ActorInfo>(actors);
this.Weapons = new ReadOnlyDictionary<string, WeaponInfo>(weapons); Weapons = new ReadOnlyDictionary<string, WeaponInfo>(weapons);
this.Voices = new ReadOnlyDictionary<string, SoundInfo>(voices); Voices = new ReadOnlyDictionary<string, SoundInfo>(voices);
this.Notifications = new ReadOnlyDictionary<string, SoundInfo>(notifications); Notifications = new ReadOnlyDictionary<string, SoundInfo>(notifications);
this.Music = new ReadOnlyDictionary<string, MusicInfo>(music); Music = new ReadOnlyDictionary<string, MusicInfo>(music);
this.Movies = new ReadOnlyDictionary<string, string>(movies); Movies = new ReadOnlyDictionary<string, string>(movies);
this.TileSets = new ReadOnlyDictionary<string, TileSet>(tileSets); TileSets = new ReadOnlyDictionary<string, TileSet>(tileSets);
this.Sequences = new ReadOnlyDictionary<string, SequenceProvider>(sequences); Sequences = new ReadOnlyDictionary<string, SequenceProvider>(sequences);
} }
public IEnumerable<KeyValuePair<string, MusicInfo>> InstalledMusic { get { return Music.Where(m => m.Value.Exists); } } public IEnumerable<KeyValuePair<string, MusicInfo>> InstalledMusic { get { return Music.Where(m => m.Value.Exists); } }

2
OpenRA.Game/Graphics/SequenceProvider.cs
View File

@@ -96,9 +96,7 @@ namespace OpenRA.Graphics
Lazy<IReadOnlyDictionary<string, Sequence>> t; Lazy<IReadOnlyDictionary<string, Sequence>> t;
if (sequenceCache.TryGetValue(key, out t)) if (sequenceCache.TryGetValue(key, out t))
{
items.Add(node.Key, t); items.Add(node.Key, t);
}
else else
{ {
t = Exts.Lazy(() => (IReadOnlyDictionary<string, Sequence>)new ReadOnlyDictionary<string, Sequence>( t = Exts.Lazy(() => (IReadOnlyDictionary<string, Sequence>)new ReadOnlyDictionary<string, Sequence>(

2
OpenRA.Game/Sound.cs
View File

@@ -385,7 +385,7 @@ namespace OpenRA
return PlayPredefined(voicedUnit.World.Map.Rules, null, voicedUnit, type, phrase, variant, false, pos, volume, true); return PlayPredefined(voicedUnit.World.Map.Rules, null, voicedUnit, type, phrase, variant, false, pos, volume, true);
} }
public static bool PlayNotification(MapRuleset rules, Player player, string type, string notification, string variant) public static bool PlayNotification(Ruleset rules, Player player, string type, string notification, string variant)
{ {
if (rules == null) if (rules == null)
throw new ArgumentNullException("rules"); throw new ArgumentNullException("rules");

2
OpenRA.Mods.D2k/Render/WithDockingOverlay.cs
View File

@@ -42,7 +42,7 @@ namespace OpenRA.Mods.RA.Render
buildComplete = !self.HasTrait<Building>(); // always render instantly for units buildComplete = !self.HasTrait<Building>(); // always render instantly for units
overlay = new Animation(rs.GetImage(self)); overlay = new Animation(self.World, rs.GetImage(self));
overlay.Play(info.Sequence); overlay.Play(info.Sequence);
rs.anims.Add("docking_overlay_{0}".F(info.Sequence), rs.anims.Add("docking_overlay_{0}".F(info.Sequence),
new AnimationWithOffset(overlay, new AnimationWithOffset(overlay,