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

Make ActorPreview and EditorActorPreview wrap ActorReference.

Browse Source
This commit is contained in:
Paul Chote
2020-06-12 13:21:09 +01:00
committed by reaperrr
parent ae7cfa56b7
commit c6c3a8c60d
22 changed files with 265 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -410,11 +410,10 @@ namespace OpenRA.Mods.Common.UtilityCommands
new OwnerInit(parts[0]),
};
var initDict = actor.InitDict;
if (health != 100)
initDict.Add(new HealthInit(health));
actor.Add(new HealthInit(health));
if (facing != 0)
initDict.Add(new FacingInit(255 - facing));
actor.Add(new FacingInit(255 - facing));
if (section == "INFANTRY")
actor.Add(new SubCellInit((SubCell)Exts.ParseByte(parts[4])));

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

@@ -11,6 +11,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.FileSystem;
namespace OpenRA.Mods.Common.UtilityCommands
@@ -57,10 +58,13 @@ namespace OpenRA.Mods.Common.UtilityCommands
foreach (var kv in map.ActorDefinitions)
{
var actor = new ActorReference(kv.Value.Value, kv.Value.ToDictionary());
var location = actor.InitDict.Get<LocationInit>().Value;
if (!map.Contains(location))
var locationInit = actor.GetOrDefault<LocationInit>();
if (locationInit == null)
continue;
if (!map.Contains(locationInit.Value))
{
Console.WriteLine("Removing actor {0} located at {1} due being outside of the new map boundaries.".F(actor.Type, location));
Console.WriteLine("Removing actor {0} located at {1} due being outside of the new map boundaries.".F(actor.Type, locationInit.Value));
forRemoval.Add(kv);
}
}