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

Fix editor crash when modifying newly placed actor ID.

Browse Source
This commit is contained in:
Paul Chote
2019-02-20 17:45:09 +00:00
committed by reaperrr
parent 6841da286c
commit 72c90d84a8
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Traits/World/EditorActorLayer.cs
View File

@@ -283,5 +283,10 @@ namespace OpenRA.Mods.Common.Traits
foreach (var preview in previewsForCell.Value) foreach (var preview in previewsForCell.Value)
destinationBuffer.Add(Pair.New(previewsForCell.Key, preview.Owner.Color.RGB)); destinationBuffer.Add(Pair.New(previewsForCell.Key, preview.Owner.Color.RGB));
} }
public EditorActorPreview this[string id]
{
get { return previews.FirstOrDefault(p => p.ID.ToLowerInvariant() == id); }
}
} }
} }

5
OpenRA.Mods.Common/Widgets/Logic/Editor/ActorEditLogic.cs
View File

@@ -122,8 +122,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var actorId = actorIDField.Text.ToLowerInvariant(); var actorId = actorIDField.Text.ToLowerInvariant();
if (CurrentActor.ID.ToLowerInvariant() != actorId) if (CurrentActor.ID.ToLowerInvariant() != actorId)
{ {
var found = world.Map.ActorDefinitions.Any(x => x.Key.ToLowerInvariant() == actorId); if (editorActorLayer[actorId] != null)
if (found)
{ {
nextActorIDStatus = ActorIDStatus.Duplicate; nextActorIDStatus = ActorIDStatus.Duplicate;
return; return;
@@ -143,8 +142,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
void SetActorID(World world, string actorId) void SetActorID(World world, string actorId)
{ {
var actorDef = world.Map.ActorDefinitions.First(x => x.Key == CurrentActor.ID);
actorDef.Key = actorId;
CurrentActor.ID = actorId; CurrentActor.ID = actorId;
nextActorIDStatus = ActorIDStatus.Normal; nextActorIDStatus = ActorIDStatus.Normal;
} }