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

Fix map loading; some cleanups

Browse Source
This commit is contained in:
Paul Chote
2010-03-03 22:55:14 +13:00
parent d405523378
commit 5c26386b2e
6 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Game.cs
View File

@@ -101,7 +101,7 @@ namespace OpenRA
Timer.Time( "ChromeProv, SeqProv, viewport: {0}" );
skipMakeAnims = true;
foreach (var actorReference in Game.world.Map.Actors)
foreach (var actorReference in world.Map.Actors)
world.CreateActor(actorReference.Name, actorReference.Location, world.players.Values.FirstOrDefault(p => p.InternalName == actorReference.Owner) ?? world.players[0]);
skipMakeAnims = false;
Timer.Time( "map actors: {0}" );

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

@@ -22,6 +22,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Xml;
using System.IO;
using OpenRA.FileFormats;
namespace OpenRA.Graphics
@@ -65,12 +66,14 @@ namespace OpenRA.Graphics
static void LoadSequencesForUnit(XmlElement eUnit)
{
string unitName = eUnit.GetAttribute("name");
Log.Write("Loading sequence {0}", unitName);
var sequences = eUnit.SelectNodes("./sequence").OfType<XmlElement>()
.Select(e => new Sequence(unitName, e))
.ToDictionary(s => s.Name);
units.Add(unitName, sequences);
// Log.Write("Loading sequence {0}", unitName);
try {
var sequences = eUnit.SelectNodes("./sequence").OfType<XmlElement>()
.Select(e => new Sequence(unitName, e))
.ToDictionary(s => s.Name);
units.Add(unitName, sequences);
} catch (FileNotFoundException) {} // Do nothing; we can crash later if we actually wanted art
}
public static Sequence GetSequence(string unitName, string sequenceName)