Fix regressions.

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

View File

@@ -420,11 +420,10 @@ namespace OpenRA
static Stance ChooseInitialStance(Player p, Player q)
{
// HACK
return Stance.Enemy;
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 qc = GetClientForPlayer(q);