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

Fix shroud for observers observing a player after win/loss.

Browse Source
This commit is contained in:
Paul Chote
2013-04-10 22:33:58 +12:00
parent 707c86fbbb
commit 2c680a1831
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Game/World.cs
View File

@@ -42,7 +42,14 @@ namespace OpenRA
public void AddPlayer(Player p) { Players.Add(p); }
public Player LocalPlayer { get; private set; }
public Player RenderPlayer;
Player renderPlayer;
public bool ObserveAfterWinOrLose;
public Player RenderPlayer
{
get { return renderPlayer == null || (ObserveAfterWinOrLose && renderPlayer.WinState != WinState.Undefined)? null : renderPlayer; }
set { renderPlayer = value; }
}
public bool FogObscures(Actor a) { return RenderPlayer != null && !RenderPlayer.Shroud.IsVisible(a); }
public bool FogObscures(CPos p) { return RenderPlayer != null && !RenderPlayer.Shroud.IsVisible(p); }
public bool ShroudObscures(Actor a) { return RenderPlayer != null && !RenderPlayer.Shroud.IsExplored(a); }

14
OpenRA.Mods.RA/ConquestVictoryConditions.cs
View File

@@ -19,13 +19,17 @@ namespace OpenRA.Mods.RA
[Desc("Milliseconds")]
public int NotificationDelay = 1500;
public object Create(ActorInitializer init) { return new ConquestVictoryConditions(this); }
public object Create(ActorInitializer init) { return new ConquestVictoryConditions(init.world, this); }
}
public class ConquestVictoryConditions : ITick, IResolveOrder
{
ConquestVictoryConditionsInfo Info;
public ConquestVictoryConditions(ConquestVictoryConditionsInfo info) { Info = info; }
public ConquestVictoryConditions(World world, ConquestVictoryConditionsInfo info)
{
world.ObserveAfterWinOrLose = true;
Info = info;
}
public void Tick(Actor self)
{
@@ -63,14 +67,11 @@ namespace OpenRA.Mods.RA
a.Kill(a);
if (self.Owner == self.World.LocalPlayer)
{
self.World.RenderPlayer = null;
Game.RunAfterDelay(Info.NotificationDelay, () =>
{
if (Game.IsCurrentWorld(self.World))
Sound.PlayNotification(self.Owner, "Speech", "Lose", self.Owner.Country.Race);
});
}
}
public void Win(Actor self)
@@ -80,10 +81,7 @@ namespace OpenRA.Mods.RA
Game.Debug("{0} is victorious.".F(self.Owner.PlayerName));
if (self.Owner == self.World.LocalPlayer)
{
self.World.RenderPlayer = null;
Game.RunAfterDelay(Info.NotificationDelay, () => Sound.PlayNotification(self.Owner, "Speech", "Win", self.Owner.Country.Race));
}
}
}