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

Add some combat to the shellmap; unfail init slightly

Browse Source
This commit is contained in:
Paul Chote
2010-05-26 19:06:13 +12:00
parent 92ba40da1a
commit b286a71487
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Game/Game.cs
View File

@@ -385,10 +385,6 @@ namespace OpenRA
LoadMap(map);
world.Queries = new World.AllQueries(world);
foreach (var p in world.players.Values)
foreach (var q in world.players.Values)
p.Stances[q] = ChooseInitialStance(p, q);
foreach (var gs in world.WorldActor.traits.WithInterface<IGameStarted>())
gs.GameStarted(world);
orderManager.StartGame();
@@ -400,15 +396,6 @@ namespace OpenRA
if (orderManager.GameStarted) return;
chat.Reset();
world.SetLocalPlayer(orderManager.Connection.LocalClientId);
foreach (var c in LobbyInfo.Clients)
world.AddPlayer(new Player(world, c));
foreach (var p in world.players.Values)
foreach (var q in world.players.Values)
p.Stances[q] = ChooseInitialStance(p, q);
world.Queries = new World.AllQueries(world);
foreach (var gs in world.WorldActor.traits.WithInterface<IGameStarted>())
@@ -418,7 +405,7 @@ namespace OpenRA
orderManager.StartGame();
}
static Stance ChooseInitialStance(Player p, Player q)
public static Stance ChooseInitialStance(Player p, Player q)
{
if (p == q) return Stance.Ally;