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

Prepare MapCreeps code for trait-defined lobby options.

Browse Source
This commit is contained in:
Paul Chote
2016-04-24 15:34:53 +01:00
parent 7e49ae7eb0
commit c412e4e86c
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Traits/SpawnActorOnDeath.cs
View File

@@ -52,17 +52,18 @@ namespace OpenRA.Mods.Common.Traits
{
readonly SpawnActorOnDeathInfo info;
readonly string faction;
readonly bool enabled;
public SpawnActorOnDeath(ActorInitializer init, SpawnActorOnDeathInfo info)
{
this.info = info;
enabled = !info.RequiresLobbyCreeps || init.Self.World.WorldActor.Trait<MapCreeps>().Enabled;
faction = init.Contains<FactionInit>() ? init.Get<FactionInit, string>() : init.Self.Owner.Faction.InternalName;
}
public void Killed(Actor self, AttackInfo e)
{
if (info.RequiresLobbyCreeps && !self.World.LobbyInfo.GlobalSettings.Creeps)
if (!enabled)
return;
if (!self.IsInWorld)

10
OpenRA.Mods.Common/Traits/World/MapCreeps.cs
View File

@@ -24,5 +24,13 @@ namespace OpenRA.Mods.Common.Traits
public readonly bool Locked = false;
}
public class MapCreeps { }
public class MapCreeps : INotifyCreated
{
public bool Enabled { get; private set; }
void INotifyCreated.Created(Actor self)
{
Enabled = self.World.LobbyInfo.GlobalSettings.Creeps;
}
}
}