unstatic SpriteLoader

This commit is contained in:
Chris Forbes
2011-01-08 21:03:33 +13:00
committed by Paul Chote
parent f032322948
commit 848622054d
10 changed files with 18 additions and 16 deletions

View File

@@ -35,7 +35,7 @@ namespace OpenRA.Mods.RA.Buildings
public BibLayer(Actor self, BibLayerInfo info)
{
this.info = info;
bibSprites = info.BibTypes.Select(x => SpriteLoader.LoadAllSprites(x)).ToArray();
bibSprites = info.BibTypes.Select(x => Game.modData.SpriteLoader.LoadAllSprites(x)).ToArray();
self.World.ActorAdded +=
a => { if (a.HasTrait<Bib>()) DoBib(a,true); };

View File

@@ -70,7 +70,8 @@ namespace OpenRA.Mods.RA.Widgets
.Where(u => u.Traits.Contains<BuildableInfo>() && u.Name[0] != '^')
.ToDictionary(
u => u.Name,
u => SpriteLoader.LoadAllSprites(u.Traits.Get<TooltipInfo>().Icon ?? (u.Name + "icon"))[0]);
u => Game.modData.SpriteLoader.LoadAllSprites(
u.Traits.Get<TooltipInfo>().Icon ?? (u.Name + "icon"))[0]);
}
public override Rectangle EventBounds

View File

@@ -43,7 +43,7 @@ namespace OpenRA.Mods.RA.Widgets
.Select(u => u.Image).Distinct()
.ToDictionary(
u => u,
u => SpriteLoader.LoadAllSprites(u)[0]);
u => Game.modData.SpriteLoader.LoadAllSprites(u)[0]);
ready = new Animation("pips");
ready.PlayRepeating("ready");

View File

@@ -36,7 +36,7 @@ namespace OpenRA.Mods.RA
public SmudgeLayer(SmudgeLayerInfo info)
{
this.Info = info;
smudgeSprites = Info.Types.Select(x => SpriteLoader.LoadAllSprites(x)).ToArray();
smudgeSprites = Info.Types.Select(x => Game.modData.SpriteLoader.LoadAllSprites(x)).ToArray();
}
public void WorldLoaded(World w)