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

world.NeutralPlayer has been defeated

Browse Source
This commit is contained in:
Paul Chote
2010-05-23 20:26:30 +12:00
parent bbbd65a6eb
commit a6f5b12a55
13 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Game/Player.cs
View File

@@ -41,7 +41,8 @@ namespace OpenRA
public readonly string InternalName;
public readonly CountryInfo Country;
public readonly int Index;
public readonly bool isSpecial = false;
public ShroudRenderer Shroud;
public World World { get; private set; }

3
OpenRA.Game/Widgets/Delegates/DiplomacyDelegate.cs
View File

@@ -29,7 +29,6 @@ namespace OpenRA.Widgets.Delegates
bg.Children.RemoveAll(w => controls.Contains(w));
controls.Clear();
var unwantedPlayers = new[] { Game.world.NeutralPlayer, Game.world.LocalPlayer };
var y = 50;
var margin = 20;
var labelWidth = (bg.Bounds.Width - 3 * margin) / 3;
@@ -58,7 +57,7 @@ namespace OpenRA.Widgets.Delegates
y += 35;
foreach (var p in Game.world.players.Values.Except(unwantedPlayers))
foreach (var p in Game.world.players.Values.Where(a => a != Game.world.LocalPlayer && !a.isSpecial))
{
var pp = p;
var label = new LabelWidget

2
OpenRA.Game/Widgets/PostGameWidget.cs
View File

@@ -45,7 +45,7 @@ namespace OpenRA.Widgets
if (world.players.Count > 2) /* more than just us + neutral */
{
var conds = world.Queries.WithTrait<IVictoryConditions>()
.Where(c => c.Actor.Owner != world.NeutralPlayer);
.Where(c => !c.Actor.Owner.isSpecial);
if (conds.Any(c => c.Actor.Owner == world.LocalPlayer && c.Trait.HasLost))
DrawText("YOU ARE DEFEATED");

2
OpenRA.Game/Widgets/WorldTooltipWidget.cs
View File

@@ -48,7 +48,7 @@ namespace OpenRA.Widgets
? actor.Info.Traits.Get<ValuedInfo>().Description
: actor.Info.Name;
var text2 = (actor.Owner == world.LocalPlayer)
? "" : (actor.Owner == world.NeutralPlayer ? "{0}" : "{0} ({1})").F(actor.Owner.PlayerName, world.LocalPlayer.Stances[actor.Owner]);
? "" : (actor.Owner.isSpecial ? "{0}" : "{0} ({1})").F(actor.Owner.PlayerName, world.LocalPlayer.Stances[actor.Owner]);
var renderer = Game.chrome.renderer;

8
OpenRA.Game/World.cs
View File

@@ -52,8 +52,6 @@ namespace OpenRA
get { return players.ContainsKey(localPlayerIndex) ? players[localPlayerIndex] : null; }
}
public Player NeutralPlayer { get; private set; }
public void SetLocalPlayer(int index)
{
localPlayerIndex = index;
@@ -103,6 +101,7 @@ namespace OpenRA
player.GetType().GetField("Palette").SetValue( player, kv.Value.Palette );// Todo: set Player.Color as well
player.GetType().GetField("PlayerName").SetValue( player, kv.Value.Name );
player.GetType().GetField("InternalName").SetValue( player, kv.Value.Name );
player.GetType().GetField("isSpecial").SetValue( player, kv.Value.isSpecial );
var country = WorldActor.Info.Traits.WithInterface<CountryInfo>().FirstOrDefault(c => kv.Value.Race == c.Race);
if (country == null)
@@ -111,9 +110,8 @@ namespace OpenRA
AddPlayer(player);
// Todo: Obsolete usage of "World.NeutralPlayer"
if (kv.Value.Name == "Neutral")
NeutralPlayer = player;
if (kv.Value.OwnsWorld)
WorldActor.Owner = player;
}
Timer.Time( "worldActor: {0}" );