Merge ModRuleset and MapRuleset into Ruleset

This commit is contained in:
Pavlos Touboulidis
2014-05-10 10:29:26 +03:00
parent 48d1dde8a7
commit 750fc4e02c
18 changed files with 54 additions and 80 deletions

View File

@@ -107,18 +107,18 @@ namespace OpenRA.Utility
int mapSize;
int actorCount = 0;
Map map = new Map();
MapRuleset rules;
Ruleset rules;
List<string> players = new List<string>();
Action<string> errorHandler;
LegacyMapImporter(string filename, MapRuleset rules, Action<string> errorHandler)
LegacyMapImporter(string filename, Ruleset rules, Action<string> errorHandler)
{
this.rules = rules;
this.errorHandler = errorHandler;
ConvertIniMap(filename);
}
public static Map Import(string filename, MapRuleset rules, Action<string> errorHandler)
public static Map Import(string filename, Ruleset rules, Action<string> errorHandler)
{
var converter = new LegacyMapImporter(filename, rules, errorHandler);
return converter.map;