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

Rewrite ActorInit queries.

Browse Source
This commit is contained in:
Paul Chote
2020-05-24 22:28:16 +01:00
committed by teinarss
parent 626b40f31b
commit 7c6ec577dc
66 changed files with 332 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenRA.Mods.Common/Traits/Buildings/FreeActor.cs
View File

@@ -9,6 +9,7 @@
*/
#endregion
using System;
using System.Collections.Generic;
using OpenRA.Primitives;
using OpenRA.Traits;
@@ -43,7 +44,7 @@ namespace OpenRA.Mods.Common.Traits
{
var init = actor.Init<FreeActorInit>();
if (init != null)
return init.Value(world);
return init.Value;
return true;
},
@@ -63,7 +64,7 @@ namespace OpenRA.Mods.Common.Traits
public FreeActor(ActorInitializer init, FreeActorInfo info)
: base(info)
{
allowSpawn = !init.Contains<FreeActorInit>() || init.Get<FreeActorInit>().ActorValue;
allowSpawn = init.GetValue<FreeActorInit, bool>(info, true);
}
protected override void TraitEnabled(Actor self)
@@ -92,13 +93,14 @@ namespace OpenRA.Mods.Common.Traits
public readonly bool ActorValue = true;
public FreeActorInit() { }
public FreeActorInit(bool init) { ActorValue = init; }
public bool Value(World world) { return ActorValue; }
public bool Value { get { return ActorValue; } }
}
public class ParentActorInit : IActorInit<Actor>
public class ParentActorInit : IActorInit
{
public readonly Actor ActorValue;
public ParentActorInit(Actor parent) { ActorValue = parent; }
public Actor Value(World world) { return ActorValue; }
readonly Actor value;
public ParentActorInit(Actor init) { value = init; }
public Lazy<Actor> Value(World world) { return new Lazy<Actor>(() => value); }
}
}