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

Merge pull request #4110 from Mailaender/spectator-bot-spawns

Browse Source 
Fixed spectating hosts being unable to select AI spawn points
This commit is contained in:
Paul Chote
2013-11-09 13:35:20 -08:00
parent 408d7a67a0 c8f7d9e714
commit 12b9334500
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs
View File

@@ -142,8 +142,11 @@ namespace OpenRA.Mods.RA.Widgets.Logic
public static void SelectSpawnPoint(OrderManager orderManager, MapPreviewWidget mapPreview, Map map, MouseInput mi) public static void SelectSpawnPoint(OrderManager orderManager, MapPreviewWidget mapPreview, Map map, MouseInput mi)
{ {
if (map == null || mi.Button != MouseButton.Left if (map == null)
|| orderManager.LocalClient.State == Session.ClientState.Ready) return;
if (mi.Button != MouseButton.Left)
return;
if (!orderManager.LocalClient.IsObserver && orderManager.LocalClient.State == Session.ClientState.Ready)
return; return;
var selectedSpawn = map.GetSpawnPoints() var selectedSpawn = map.GetSpawnPoints()
@@ -156,7 +159,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
if (selectedSpawn == 0 || !owned) if (selectedSpawn == 0 || !owned)
{ {
var locals = orderManager.LobbyInfo.Clients.Where(c => c.Index == orderManager.LocalClient.Index || (Game.IsHost && c.Bot != null)); var locals = orderManager.LobbyInfo.Clients.Where(c => c.Index == orderManager.LocalClient.Index || (Game.IsHost && c.Bot != null));
var playerToMove = locals.FirstOrDefault(c => (selectedSpawn == 0) ^ (c.SpawnPoint == 0)); var playerToMove = locals.FirstOrDefault(c => ((selectedSpawn == 0) ^ (c.SpawnPoint == 0) && !c.IsObserver));
orderManager.IssueOrder(Order.Command("spawn {0} {1}".F((playerToMove ?? orderManager.LocalClient).Index, selectedSpawn))); orderManager.IssueOrder(Order.Command("spawn {0} {1}".F((playerToMove ?? orderManager.LocalClient).Index, selectedSpawn)));
} }
} }