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

Require explicit INotifyAddedToWorld and INotifyRemovedFromWorld

Browse Source
This commit is contained in:
reaperrr
2017-09-27 23:50:30 +02:00
committed by abcdefg30
parent 8ec3d5ddb8
commit 8533debc44
17 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Traits/TraitsInterfaces.cs
View File

@@ -134,7 +134,9 @@ namespace OpenRA.Traits
[RequireExplicitImplementation]
public interface INotifyCreated { void Created(Actor self); }
[RequireExplicitImplementation]
public interface INotifyAddedToWorld { void AddedToWorld(Actor self); }
[RequireExplicitImplementation]
public interface INotifyRemovedFromWorld { void RemovedFromWorld(Actor self); }
[RequireExplicitImplementation]

2
OpenRA.Mods.Cnc/Traits/EnergyWall.cs
View File

@@ -103,7 +103,7 @@ namespace OpenRA.Mods.Cnc.Traits
return !active;
}
public override void AddedToWorld(Actor self)
protected override void AddedToWorld(Actor self)
{
base.AddedToWorld(self);
blockedPositions = info.Tiles(self.Location);

4
OpenRA.Mods.Cnc/Traits/Render/WithBuildingBib.cs
View File

@@ -88,7 +88,7 @@ namespace OpenRA.Mods.Cnc.Traits
bi = self.Info.TraitInfo<BuildingInfo>();
}
public void AddedToWorld(Actor self)
void INotifyAddedToWorld.AddedToWorld(Actor self)
{
var rows = info.HasMinibib ? 1 : 2;
var width = bi.Dimensions.X;
@@ -119,7 +119,7 @@ namespace OpenRA.Mods.Cnc.Traits
}
}
public void RemovedFromWorld(Actor self)
void INotifyRemovedFromWorld.RemovedFromWorld(Actor self)
{
foreach (var a in anims)
rs.Remove(a);

4
OpenRA.Mods.Common/Scripting/ScriptTriggers.cs
View File

@@ -322,7 +322,7 @@ namespace OpenRA.Mods.Common.Scripting
}
}
public void AddedToWorld(Actor self)
void INotifyAddedToWorld.AddedToWorld(Actor self)
{
if (world.Disposing)
return;
@@ -341,7 +341,7 @@ namespace OpenRA.Mods.Common.Scripting
}
}
public void RemovedFromWorld(Actor self)
void INotifyRemovedFromWorld.RemovedFromWorld(Actor self)
{
if (world.Disposing)
return;

7
OpenRA.Mods.Common/Traits/Buildings/Building.cs
View File

@@ -295,7 +295,12 @@ namespace OpenRA.Mods.Common.Traits
NotifyBuildingComplete(self);
}
public virtual void AddedToWorld(Actor self)
void INotifyAddedToWorld.AddedToWorld(Actor self)
{
AddedToWorld(self);
}
protected virtual void AddedToWorld(Actor self)
{
if (Info.RemoveSmudgesOnBuild)
RemoveSmudges();

2
OpenRA.Mods.Common/Traits/Buildings/Gate.cs
View File

@@ -114,7 +114,7 @@ namespace OpenRA.Mods.Common.Traits
return !self.IsDisabled() && BuildComplete && blocking.AppearsFriendlyTo(self);
}
public override void AddedToWorld(Actor self)
protected override void AddedToWorld(Actor self)
{
base.AddedToWorld(self);
blockedPositions = Info.Tiles(self.Location);

4
OpenRA.Mods.Common/Traits/Conditions/ProximityExternalCondition.cs
View File

@@ -62,13 +62,13 @@ namespace OpenRA.Mods.Common.Traits
cachedVRange = WDist.Zero;
}
public void AddedToWorld(Actor self)
void INotifyAddedToWorld.AddedToWorld(Actor self)
{
cachedPosition = self.CenterPosition;
proximityTrigger = self.World.ActorMap.AddProximityTrigger(cachedPosition, cachedRange, cachedVRange, ActorEntered, ActorExited);
}
public void RemovedFromWorld(Actor self)
void INotifyRemovedFromWorld.RemovedFromWorld(Actor self)
{
self.World.ActorMap.RemoveProximityTrigger(proximityTrigger);
}

4
OpenRA.Mods.Common/Traits/Crates/Crate.cs
View File

@@ -212,7 +212,7 @@ namespace OpenRA.Mods.Common.Traits
return self.IsAtGroundLevel() && crushClasses.Contains(info.CrushClass);
}
public void AddedToWorld(Actor self)
void INotifyAddedToWorld.AddedToWorld(Actor self)
{
self.World.AddToMaps(self, this);
@@ -221,7 +221,7 @@ namespace OpenRA.Mods.Common.Traits
cs.IncrementCrates();
}
public void RemovedFromWorld(Actor self)
void INotifyRemovedFromWorld.RemovedFromWorld(Actor self)
{
self.World.RemoveFromMaps(self, this);

2
OpenRA.Mods.Common/Traits/DamagedByTerrain.cs
View File

@@ -52,7 +52,7 @@ namespace OpenRA.Mods.Common.Traits
health = self.Trait<Health>();
}
public void AddedToWorld(Actor self)
void INotifyAddedToWorld.AddedToWorld(Actor self)
{
if (!Info.StartOnThreshold)
return;

4
OpenRA.Mods.Common/Traits/Husk.cs
View File

@@ -118,12 +118,12 @@ namespace OpenRA.Mods.Common.Traits
self.World.UpdateMaps(self, this);
}
public void AddedToWorld(Actor self)
void INotifyAddedToWorld.AddedToWorld(Actor self)
{
self.World.AddToMaps(self, this);
}
public void RemovedFromWorld(Actor self)
void INotifyRemovedFromWorld.RemovedFromWorld(Actor self)
{
self.World.RemoveFromMaps(self, this);
}

4
OpenRA.Mods.Common/Traits/Immobile.cs
View File

@@ -52,7 +52,7 @@ namespace OpenRA.Mods.Common.Traits
public WPos CenterPosition { get { return position; } }
public IEnumerable<Pair<CPos, SubCell>> OccupiedCells() { return occupied; }
public void AddedToWorld(Actor self)
void INotifyAddedToWorld.AddedToWorld(Actor self)
{
self.World.ActorMap.AddInfluence(self, this);
self.World.ActorMap.AddPosition(self, this);
@@ -61,7 +61,7 @@ namespace OpenRA.Mods.Common.Traits
self.World.ScreenMap.Add(self);
}
public void RemovedFromWorld(Actor self)
void INotifyRemovedFromWorld.RemovedFromWorld(Actor self)
{
self.World.ActorMap.RemoveInfluence(self, this);
self.World.ActorMap.RemovePosition(self, this);

4
OpenRA.Mods.Common/Traits/Mobile.cs
View File

@@ -569,12 +569,12 @@ namespace OpenRA.Mods.Common.Traits
}
}
public void AddedToWorld(Actor self)
void INotifyAddedToWorld.AddedToWorld(Actor self)
{
self.World.AddToMaps(self, this);
}
public void RemovedFromWorld(Actor self)
void INotifyRemovedFromWorld.RemovedFromWorld(Actor self)
{
self.World.RemoveFromMaps(self, this);
}

2
OpenRA.Mods.Common/Traits/ParaDrop.cs
View File

@@ -96,7 +96,7 @@ namespace OpenRA.Mods.Common.Traits
return actorToDrop.Trait<IPositionable>().CanEnterCell(p);
}
public void RemovedFromWorld(Actor self)
void INotifyRemovedFromWorld.RemovedFromWorld(Actor self)
{
OnRemovedFromWorld(self);
}

3
OpenRA.Mods.Common/Traits/Passenger.cs
View File

@@ -120,7 +120,8 @@ namespace OpenRA.Mods.Common.Traits
return true;
}
public void RemovedFromWorld(Actor self) { Unreserve(self); }
void INotifyRemovedFromWorld.RemovedFromWorld(Actor self) { Unreserve(self); }
public void Unreserve(Actor self)
{
if (ReservedCargo == null)

8
OpenRA.Mods.Common/Traits/Power/Power.cs
View File

@@ -43,9 +43,11 @@ namespace OpenRA.Mods.Common.Traits
protected override void TraitEnabled(Actor self) { PlayerPower.UpdateActor(self); }
protected override void TraitDisabled(Actor self) { PlayerPower.UpdateActor(self); }
public void AddedToWorld(Actor self) { PlayerPower.UpdateActor(self); }
public void RemovedFromWorld(Actor self) { PlayerPower.RemoveActor(self); }
public void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
void INotifyAddedToWorld.AddedToWorld(Actor self) { PlayerPower.UpdateActor(self); }
void INotifyRemovedFromWorld.RemovedFromWorld(Actor self) { PlayerPower.RemoveActor(self); }
void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
{
PlayerPower.RemoveActor(self);
PlayerPower = newOwner.PlayerActor.Trait<PowerManager>();

2
OpenRA.Mods.Common/Traits/Render/WithWallSpriteBody.cs
View File

@@ -155,7 +155,7 @@ namespace OpenRA.Mods.Common.Traits.Render
aat.SetDirty();
}
public void RemovedFromWorld(Actor self)
void INotifyRemovedFromWorld.RemovedFromWorld(Actor self)
{
UpdateNeighbours(self);
}

2
OpenRA.Mods.D2k/Traits/Buildings/LaysTerrain.cs
View File

@@ -49,7 +49,7 @@ namespace OpenRA.Mods.D2k.Traits
buildingInfo = self.Info.TraitInfo<BuildingInfo>();
}
public void AddedToWorld(Actor self)
void INotifyAddedToWorld.AddedToWorld(Actor self)
{
var map = self.World.Map;