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

Add lobby options for Shroud and Fog.

Browse Source
This commit is contained in:
Paul Chote
2013-08-04 12:25:32 +12:00
parent d867e8200f
commit c08f602661
14 changed files with 143 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Game/Traits/World/Shroud.cs
View File

@@ -18,14 +18,11 @@ namespace OpenRA.Traits
{
public class ShroudInfo : ITraitInfo
{
public readonly bool Shroud = true;
public readonly bool Fog = true;
public object Create(ActorInitializer init) { return new Shroud(init.self, this); }
public object Create(ActorInitializer init) { return new Shroud(init.self); }
}
public class Shroud
{
public ShroudInfo Info;
Actor self;
Map map;
@@ -42,9 +39,8 @@ namespace OpenRA.Traits
public int Hash { get; private set; }
public Shroud(Actor self, ShroudInfo info)
public Shroud(Actor self)
{
Info = info;
this.self = self;
map = self.World.Map;
@@ -58,7 +54,7 @@ namespace OpenRA.Traits
self.World.ActorAdded += AddShroudGeneration;
self.World.ActorRemoved += RemoveShroudGeneration;
if (!info.Shroud)
if (!self.World.LobbyInfo.GlobalSettings.Shroud)
ExploredBounds = map.Bounds;
}
@@ -252,7 +248,7 @@ namespace OpenRA.Traits
if (!map.IsInMap(x, y))
return false;
if (!Info.Shroud)
if (!self.World.LobbyInfo.GlobalSettings.Shroud)
return true;
return explored[x, y] && (generatedShroudCount[x, y] == 0 || visibleCount[x, y] > 0);
@@ -271,7 +267,7 @@ namespace OpenRA.Traits
if (x < 0 || x >= map.MapSize.X || y < 0 || y >= map.MapSize.Y)
return false;
if (!Info.Fog)
if (!self.World.LobbyInfo.GlobalSettings.Fog)
return true;
return visibleCount[x, y] > 0;