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

Misc remaining FileSystem cleanups.

Browse Source
This commit is contained in:
Paul Chote
2016-02-15 03:37:08 +00:00
parent d573e21a48
commit 88f6daf57f
8 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/UtilityCommands/CheckSequenceSprites.cs
View File

@@ -32,7 +32,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
foreach (var t in modData.Manifest.TileSets)
{
var ts = new TileSet(modData, t);
var ts = new TileSet(modData.DefaultFileSystem, t);
Console.WriteLine("Tileset: " + ts.Name);
var sc = new SpriteCache(modData.DefaultFileSystem, modData.SpriteLoaders, new SheetBuilder(SheetType.Indexed));
var nodes = MiniYaml.Merge(modData.Manifest.Sequences.Select(s => MiniYaml.FromStream(modData.DefaultFileSystem.Open(s))));

2
OpenRA.Mods.Common/UtilityCommands/FixClassicTilesets.cs
View File

@@ -44,7 +44,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
foreach (var t in modData.Manifest.TileSets)
{
var ts = new TileSet(modData, t);
var ts = new TileSet(modData.DefaultFileSystem, t);
var frameCache = new FrameCache(modData.DefaultFileSystem, modData.SpriteLoaders);
Console.WriteLine("Tileset: " + ts.Name);

4
OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs
View File

@@ -29,6 +29,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
MapSize = mapSize;
}
public ModData ModData;
public Map Map;
public Ruleset Rules;
public List<string> Players = new List<string>();
@@ -42,9 +43,10 @@ namespace OpenRA.Mods.Common.UtilityCommands
[Desc("FILENAME", "Convert a legacy INI/MPR map to the OpenRA format.")]
public virtual void Run(ModData modData, string[] args)
{
ModData = modData;
// HACK: The engine code assumes that Game.modData is set.
Game.ModData = modData;
Rules = modData.RulesetCache.Load(modData.DefaultFileSystem);
var filename = args[1];

3
OpenRA.Mods.Common/Widgets/Logic/CreditsLogic.cs
View File

@@ -20,6 +20,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
public CreditsLogic(Widget widget, Action onExit)
{
var panel = widget.Get("CREDITS_PANEL");
var modData = Game.ModData;
panel.Get<ButtonWidget>("BACK_BUTTON").OnClick = () =>
{
@@ -31,7 +32,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var template = scrollPanel.Get<LabelWidget>("CREDITS_TEMPLATE");
scrollPanel.RemoveChildren();
var lines = Game.ModData.ModFiles.Open("AUTHORS").ReadAllLines();
var lines = modData.DefaultFileSystem.Open("AUTHORS").ReadAllLines();
foreach (var l in lines)
{
// Improve the formatting

2
OpenRA.Mods.Common/Widgets/VqaPlayerWidget.cs
View File

@@ -41,7 +41,7 @@ namespace OpenRA.Mods.Common.Widgets
{
if (filename == cachedVideo)
return;
var video = new VqaReader(Game.ModData.ModFiles.Open(filename));
var video = new VqaReader(Game.ModData.DefaultFileSystem.Open(filename));
cachedVideo = filename;
Open(video);