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

Allow map-placed frozen actors to start revealed.

Browse Source
This commit is contained in:
Paul Chote
2013-08-04 11:41:24 +12:00
parent cc5390c289
commit 136ddf1697
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Mods.RA/LeavesHusk.cs
View File

@@ -36,6 +36,7 @@ namespace OpenRA.Mods.RA
{ {
var td = new TypeDictionary var td = new TypeDictionary
{ {
new ParentActorInit(self),
new LocationInit(self.Location), new LocationInit(self.Location),
new CenterLocationInit(self.CenterLocation), new CenterLocationInit(self.CenterLocation),
new OwnerInit(self.Owner), new OwnerInit(self.Owner),

24
OpenRA.Mods.RA/Modifiers/FrozenUnderFog.cs
View File

@@ -19,20 +19,25 @@ namespace OpenRA.Mods.RA
{ {
public class FrozenUnderFogInfo : ITraitInfo, Requires<BuildingInfo>, Requires<RenderSpritesInfo> public class FrozenUnderFogInfo : ITraitInfo, Requires<BuildingInfo>, Requires<RenderSpritesInfo>
{ {
public object Create(ActorInitializer init) { return new FrozenUnderFog(init.self); } public readonly bool StartsRevealed = false;
public object Create(ActorInitializer init) { return new FrozenUnderFog(init, this); }
} }
public class FrozenUnderFog : IRenderModifier, IVisibilityModifier, ITickRender public class FrozenUnderFog : IRenderModifier, IVisibilityModifier, ITickRender
{ {
FrozenActorProxy proxy; FrozenActorProxy proxy;
IEnumerable<CPos> footprint; IEnumerable<CPos> footprint;
bool visible; bool visible, cacheFirstFrame;
public FrozenUnderFog(Actor self) public FrozenUnderFog(ActorInitializer init, FrozenUnderFogInfo info)
{ {
footprint = FootprintUtils.Tiles(self); footprint = FootprintUtils.Tiles(init.self);
proxy = new FrozenActorProxy(self, footprint); proxy = new FrozenActorProxy(init.self, footprint);
self.World.AddFrameEndTask(w => w.Add(proxy)); init.world.AddFrameEndTask(w => w.Add(proxy));
// Spawned actors (e.g. building husks) shouldn't be revealed
cacheFirstFrame = info.StartsRevealed && !init.Contains<ParentActorInit>();
} }
public bool IsVisible(Actor self, Player byPlayer) public bool IsVisible(Actor self, Player byPlayer)
@@ -46,6 +51,13 @@ namespace OpenRA.Mods.RA
return; return;
visible = IsVisible(self, self.World.RenderPlayer); visible = IsVisible(self, self.World.RenderPlayer);
if (cacheFirstFrame)
{
visible = true;
cacheFirstFrame = false;
}
if (visible) if (visible)
proxy.SetRenderables(self.Render(wr)); proxy.SetRenderables(self.Render(wr));
} }