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

Add ModData parameter to ILintMapPass.

Browse Source
This commit is contained in:
Paul Chote
2018-06-21 22:33:14 +00:00
parent f50a891d18
commit d46278ab0e
7 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Lint/CheckActors.cs
View File

@@ -17,7 +17,7 @@ namespace OpenRA.Mods.Common.Lint
{ {
public class CheckActors : ILintMapPass public class CheckActors : ILintMapPass
{ {
public void Run(Action<string> emitError, Action<string> emitWarning, Map map) public void Run(Action<string> emitError, Action<string> emitWarning, ModData modData, Map map)
{ {
var actorTypes = map.ActorDefinitions.Select(a => a.Value.Value); var actorTypes = map.ActorDefinitions.Select(a => a.Value.Value);
foreach (var actor in actorTypes) foreach (var actor in actorTypes)

2
OpenRA.Mods.Common/Lint/CheckMapCordon.cs
View File

@@ -16,7 +16,7 @@ namespace OpenRA.Mods.Common.Lint
{ {
public class CheckMapCordon : ILintMapPass public class CheckMapCordon : ILintMapPass
{ {
public void Run(Action<string> emitError, Action<string> emitWarning, Map map) public void Run(Action<string> emitError, Action<string> emitWarning, ModData modData, Map map)
{ {
if (map.Bounds.Left == 0 || map.Bounds.Top == 0 if (map.Bounds.Left == 0 || map.Bounds.Top == 0
|| map.Bounds.Right == map.MapSize.X || map.Bounds.Bottom == map.MapSize.Y) || map.Bounds.Right == map.MapSize.X || map.Bounds.Bottom == map.MapSize.Y)

2
OpenRA.Mods.Common/Lint/CheckMapMetadata.cs
View File

@@ -17,7 +17,7 @@ namespace OpenRA.Mods.Common.Lint
{ {
public class CheckMapMetadata : ILintMapPass public class CheckMapMetadata : ILintMapPass
{ {
public void Run(Action<string> emitError, Action<string> emitWarning, Map map) public void Run(Action<string> emitError, Action<string> emitWarning, ModData modData, Map map)
{ {
if (map.MapFormat != Map.SupportedMapFormat) if (map.MapFormat != Map.SupportedMapFormat)
emitError("Map format {0} does not match the supported version {1}." emitError("Map format {0} does not match the supported version {1}."

2
OpenRA.Mods.Common/Lint/CheckPlayers.cs
View File

@@ -19,7 +19,7 @@ namespace OpenRA.Mods.Common.Lint
{ {
public class CheckPlayers : ILintMapPass public class CheckPlayers : ILintMapPass
{ {
public void Run(Action<string> emitError, Action<string> emitWarning, Map map) public void Run(Action<string> emitError, Action<string> emitWarning, ModData modData, Map map)
{ {
var players = new MapPlayers(map.PlayerDefinitions).Players; var players = new MapPlayers(map.PlayerDefinitions).Players;
var worldOwnerFound = false; var worldOwnerFound = false;

3
OpenRA.Mods.Common/Lint/CheckSequences.cs
View File

@@ -25,12 +25,11 @@ namespace OpenRA.Mods.Common.Lint
List<MiniYamlNode> sequenceDefinitions; List<MiniYamlNode> sequenceDefinitions;
public void Run(Action<string> emitError, Action<string> emitWarning, Map map) public void Run(Action<string> emitError, Action<string> emitWarning, ModData modData, Map map)
{ {
if (map.SequenceDefinitions == null) if (map.SequenceDefinitions == null)
return; return;
var modData = Game.ModData;
this.emitError = emitError; this.emitError = emitError;
sequenceDefinitions = MiniYaml.Load(map, modData.Manifest.Sequences, map.SequenceDefinitions); sequenceDefinitions = MiniYaml.Load(map, modData.Manifest.Sequences, map.SequenceDefinitions);

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

@@ -105,7 +105,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
try try
{ {
var customMapPass = (ILintMapPass)modData.ObjectCreator.CreateBasic(customMapPassType); var customMapPass = (ILintMapPass)modData.ObjectCreator.CreateBasic(customMapPassType);
customMapPass.Run(EmitError, EmitWarning, testMap); customMapPass.Run(EmitError, EmitWarning, modData, testMap);
} }
catch (Exception e) catch (Exception e)
{ {

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

@@ -14,6 +14,6 @@ using System;
namespace OpenRA.Mods.Common.Lint namespace OpenRA.Mods.Common.Lint
{ {
public interface ILintPass { void Run(Action<string> emitError, Action<string> emitWarning, ModData modData); } public interface ILintPass { void Run(Action<string> emitError, Action<string> emitWarning, ModData modData); }
public interface ILintMapPass { void Run(Action<string> emitError, Action<string> emitWarning, Map map); } public interface ILintMapPass { void Run(Action<string> emitError, Action<string> emitWarning, ModData modData, Map map); }
public interface ILintRulesPass { void Run(Action<string> emitError, Action<string> emitWarning, Ruleset rules); } public interface ILintRulesPass { void Run(Action<string> emitError, Action<string> emitWarning, Ruleset rules); }
} }