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

Merge pull request #9075 from deniz1a/fix-crate

Browse Source 
Removes LocalPlayer check from HideMapCrateAction and RevealMapCrateAction.
This commit is contained in:
Pavel Penev
2015-08-23 23:17:28 +03:00
parent bec209085b 3b36ddfc54
commit d64f5f29a4
2 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,9 +32,7 @@ namespace OpenRA.Mods.Common.Traits
public override void Activate(Actor collector) public override void Activate(Actor collector)
{ {
if (collector.Owner == collector.World.LocalPlayer) collector.Owner.Shroud.ResetExploration();
collector.Owner.Shroud.ResetExploration();
base.Activate(collector); base.Activate(collector);
} }
} }

19
OpenRA.Mods.Common/Traits/Crates/RevealMapCrateAction.cs
View File

@@ -8,8 +8,6 @@
*/ */
#endregion #endregion
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("Reveals the entire map.")] [Desc("Reveals the entire map.")]
@@ -31,18 +29,15 @@ namespace OpenRA.Mods.Common.Traits
this.info = info; this.info = info;
} }
bool ShouldReveal(Player collectingPlayer)
{
if (info.IncludeAllies)
return collectingPlayer.World.LocalPlayer != null &&
collectingPlayer.Stances[collectingPlayer.World.LocalPlayer] == Stance.Ally;
return collectingPlayer == collectingPlayer.World.LocalPlayer;
}
public override void Activate(Actor collector) public override void Activate(Actor collector)
{ {
if (ShouldReveal(collector.Owner)) if (info.IncludeAllies)
{
foreach (var player in collector.World.Players)
if (collector.Owner.IsAlliedWith(player))
player.Shroud.ExploreAll(player.World);
}
else
collector.Owner.Shroud.ExploreAll(collector.World); collector.Owner.Shroud.ExploreAll(collector.World);
base.Activate(collector); base.Activate(collector);