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

Fix regressions.

Browse Source
This commit is contained in:
Paul Chote
2010-05-23 19:52:05 +12:00
parent d9931af5ae
commit bbbd65a6eb
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Game/Game.cs
View File

@@ -420,11 +420,10 @@ namespace OpenRA
static Stance ChooseInitialStance(Player p, Player q) static Stance ChooseInitialStance(Player p, Player q)
{ {
// HACK
return Stance.Enemy;
if (p == q) return Stance.Ally; if (p == q) return Stance.Ally;
if (p == world.NeutralPlayer || q == world.NeutralPlayer) return Stance.Neutral;
// Hack: All map players are neutral wrt everyone else
if (p.Index < 0 || q.Index < 0) return Stance.Neutral;
var pc = GetClientForPlayer(p); var pc = GetClientForPlayer(p);
var qc = GetClientForPlayer(q); var qc = GetClientForPlayer(q);

3
OpenRA.Game/Traits/Player/TechTreeCache.cs
View File

@@ -26,9 +26,6 @@ namespace OpenRA.Traits
public void Tick( Player owner, Cache<string, List<Actor>> buildings ) public void Tick( Player owner, Cache<string, List<Actor>> buildings )
{ {
// HACK
return;
var effectivePrereq = prerequisites.Where( a => a.Traits.Get<BuildableInfo>().Owner.Contains( owner.Country.Race ) ); var effectivePrereq = prerequisites.Where( a => a.Traits.Get<BuildableInfo>().Owner.Contains( owner.Country.Race ) );
var nowHasPrerequisites = effectivePrereq.Any() && var nowHasPrerequisites = effectivePrereq.Any() &&
effectivePrereq.All( a => buildings[ a.Name ].Any( b => !b.traits.Get<Building>().Disabled ) ); effectivePrereq.All( a => buildings[ a.Name ].Any( b => !b.traits.Get<Building>().Disabled ) );

9
OpenRA.Game/World.cs
View File

@@ -97,15 +97,18 @@ namespace OpenRA
foreach (var kv in Map.Players) foreach (var kv in Map.Players)
{ {
var player = new Player(this, null); var player = new Player(this, null);
Console.WriteLine("Creating Player {0}", kv.Key);
// Lets just pretend that i didn't do this.... Will fix later // Lets just pretend that i didn't do this.... Will fix later
player.GetType().GetField("Index").SetValue( player, mapPlayerIndex-- ); player.GetType().GetField("Index").SetValue( player, mapPlayerIndex-- );
player.GetType().GetField("Palette").SetValue( player, kv.Value.Palette );// Todo: set Player.Color as well 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("PlayerName").SetValue( player, kv.Value.Name );
player.GetType().GetField("InternalName").SetValue( player, kv.Value.Name ); player.GetType().GetField("InternalName").SetValue( player, kv.Value.Name );
player.GetType().GetField("Country").SetValue( player, this.GetCountries().FirstOrDefault(c => kv.Value.Race == c.Name) );
var country = WorldActor.Info.Traits.WithInterface<CountryInfo>().FirstOrDefault(c => kv.Value.Race == c.Race);
if (country == null)
throw new NotImplementedException("Invalid country: {0}".F(kv.Value.Race));
player.GetType().GetField("Country").SetValue( player, country);
AddPlayer(player); AddPlayer(player);
// Todo: Obsolete usage of "World.NeutralPlayer" // Todo: Obsolete usage of "World.NeutralPlayer"