Merge pull request #10901 from pchote/server-maps

Remove Map usage from the server and mission browser.
This commit is contained in:
abcdefg30
2016-03-13 11:24:04 +01:00
8 changed files with 140 additions and 66 deletions

View File

@@ -295,7 +295,8 @@ namespace OpenRA
{
try
{
return Ruleset.LoadFromMap(modData, this);
return Ruleset.Load(modData, this, Tileset, RuleDefinitions, WeaponDefinitions,
VoiceDefinitions, NotificationDefinitions, MusicDefinitions, SequenceDefinitions);
}
catch (Exception e)
{
@@ -1190,7 +1191,6 @@ namespace OpenRA
return FindTilesInAnnulus(center, 0, maxRange, allowOutsideBounds);
}
// Placeholders for future implementation
public Stream Open(string filename)
{
// Explicit package paths never refer to a map