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

tidy LobbyLogic spawn chooser

Browse Source
This commit is contained in:
Chris Forbes
2011-10-18 20:43:00 +13:00
parent 7ef93f2cf5
commit 12968ff9b9
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
View File

@@ -69,24 +69,18 @@ namespace OpenRA.Mods.RA.Widgets.Logic
|| orderManager.LocalClient.State == Session.ClientState.Ready) || orderManager.LocalClient.State == Session.ClientState.Ready)
return; return;
var p = Map.GetSpawnPoints() var selectedSpawn = Map.GetSpawnPoints()
.Select((sp, i) => Pair.New(mapPreview.ConvertToPreview(Map, sp), i)) .Select((sp, i) => Pair.New(mapPreview.ConvertToPreview(Map, sp), i))
.Where(a => (a.First - mi.Location).LengthSquared < 64) .Where(a => (a.First - mi.Location).LengthSquared < 64)
.Select(a => a.Second + 1) .Select(a => a.Second + 1)
.FirstOrDefault(); .FirstOrDefault();
var owned = orderManager.LobbyInfo.Clients.Any(c => c.SpawnPoint == p); var owned = orderManager.LobbyInfo.Clients.Any(c => c.SpawnPoint == selectedSpawn);
if (p == 0 || !owned) if (selectedSpawn == 0 || !owned)
{ {
if (Game.IsHost) var locals = orderManager.LobbyInfo.Clients.Where(c => c.Index == orderManager.LocalClient.Index || (Game.IsHost && c.Bot != null));
{ var playerToMove = locals.Where(c => (selectedSpawn == 0) ^ (c.SpawnPoint == 0)).FirstOrDefault();
var locals = orderManager.LobbyInfo.Clients.Where(c => c.Index == orderManager.LocalClient.Index || c.Bot != null); orderManager.IssueOrder(Order.Command("spawn {0} {1}".F((playerToMove ?? orderManager.LocalClient).Index, selectedSpawn)));
var playerToMove = locals.Where(c => (p == 0) ? c.SpawnPoint != 0 : c.SpawnPoint == 0).FirstOrDefault();
orderManager.IssueOrder(Order.Command("spawn {0} {1}".F((playerToMove != null) ? playerToMove.Index : orderManager.LocalClient.Index, p)));
}
else
orderManager.IssueOrder(Order.Command("spawn {0} {1}".F(orderManager.LocalClient.Index, p)));
} }
}; };