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

Check for out of bounds map actors and remove them if so.

Browse Source
This commit is contained in:
Matthias Mailänder
2016-02-13 21:56:24 +01:00
parent 8b9e60ba82
commit 3a8d28e508
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OpenRA.Mods.Common/UtilityCommands/ResizeMapCommand.cs
View File

@@ -9,6 +9,8 @@
#endregion #endregion
using System; using System;
using System.Collections.Generic;
using System.Linq;
namespace OpenRA.Mods.Common.UtilityCommands namespace OpenRA.Mods.Common.UtilityCommands
{ {
@@ -19,6 +21,8 @@ namespace OpenRA.Mods.Common.UtilityCommands
int width; int width;
int height; int height;
Map map;
public bool ValidateArguments(string[] args) public bool ValidateArguments(string[] args)
{ {
if (args.Length < 4) if (args.Length < 4)
@@ -43,9 +47,26 @@ namespace OpenRA.Mods.Common.UtilityCommands
public void Run(ModData modData, string[] args) public void Run(ModData modData, string[] args)
{ {
Game.ModData = modData; Game.ModData = modData;
var map = new Map(args[1]); map = new Map(args[1]);
Console.WriteLine("Resizing map {0} from {1} to {2},{3}", map.Title, map.MapSize, width, height); Console.WriteLine("Resizing map {0} from {1} to {2},{3}", map.Title, map.MapSize, width, height);
map.Resize(width, height); map.Resize(width, height);
var forRemoval = new List<MiniYamlNode>();
foreach (var kv in map.ActorDefinitions)
{
var actor = new ActorReference(kv.Value.Value, kv.Value.ToDictionary());
var location = actor.InitDict.Get<LocationInit>().Value(null);
if (!map.Contains(location))
{
Console.WriteLine("Removing actor {0} located at {1} due being outside of the new map boundaries.".F(actor.Type, location));
forRemoval.Add(kv);
}
}
foreach (var kv in forRemoval)
map.ActorDefinitions.Remove(kv);
map.Save(map.Path); map.Save(map.Path);
} }
} }