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

Make a number of navigation keys available to spectators

Browse Source 
This will make the following keys available to spectators and in replays:

* Center screen on last event/beacon [Space]
* Center screen on current selection [Home]
* Cycle construction yards [H]
* Cycle production buildings [Tab]

The latter two need a player view to work, the former two work in all
views.
This commit is contained in:
Oliver Brakmann
2015-09-09 21:43:13 +02:00
parent 379b5a181f
commit 28c78f6085
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.Common/Widgets/WorldCommandWidget.cs
View File

@@ -39,7 +39,7 @@ namespace OpenRA.Mods.Common.Widgets
public override bool HandleKeyPress(KeyInput e) public override bool HandleKeyPress(KeyInput e)
{ {
if (world == null || world.LocalPlayer == null) if (world == null)
return false; return false;
return ProcessInput(e); return ProcessInput(e);
@@ -64,6 +64,10 @@ namespace OpenRA.Mods.Common.Widgets
if (key == ks.ToSelectionKey) if (key == ks.ToSelectionKey)
return ToSelection(); return ToSelection();
// Put all functions that are valid for observers/spectators above this line.
if (world.LocalPlayer == null || world.LocalPlayer.Spectating)
return false;
// Put all functions that aren't unit-specific before this line! // Put all functions that aren't unit-specific before this line!
if (!world.Selection.Actors.Any() || world.IsGameOver) if (!world.Selection.Actors.Any() || world.IsGameOver)
return false; return false;
@@ -188,7 +192,7 @@ namespace OpenRA.Mods.Common.Widgets
bool CycleBases() bool CycleBases()
{ {
var bases = world.ActorsWithTrait<BaseBuilding>() var bases = world.ActorsWithTrait<BaseBuilding>()
.Where(a => a.Actor.Owner == world.LocalPlayer) .Where(a => a.Actor.Owner == world.RenderPlayer)
.Select(b => b.Actor) .Select(b => b.Actor)
.ToList(); .ToList();
@@ -197,7 +201,7 @@ namespace OpenRA.Mods.Common.Widgets
{ {
var building = world.ActorsWithTrait<Building>() var building = world.ActorsWithTrait<Building>()
.Select(b => b.Actor) .Select(b => b.Actor)
.FirstOrDefault(a => a.Owner == world.LocalPlayer && a.Info.HasTraitInfo<SelectableInfo>()); .FirstOrDefault(a => a.Owner == world.RenderPlayer && a.Info.HasTraitInfo<SelectableInfo>());
// No buildings left // No buildings left
if (building == null) if (building == null)
@@ -223,7 +227,7 @@ namespace OpenRA.Mods.Common.Widgets
bool CycleProductionBuildings() bool CycleProductionBuildings()
{ {
var facilities = world.ActorsWithTrait<Production>() var facilities = world.ActorsWithTrait<Production>()
.Where(a => a.Actor.Owner == world.LocalPlayer && !a.Actor.Info.HasTraitInfo<BaseBuildingInfo>()) .Where(a => a.Actor.Owner == world.RenderPlayer && !a.Actor.Info.HasTraitInfo<BaseBuildingInfo>())
.OrderBy(f => f.Actor.Info.TraitInfo<ProductionInfo>().Produces.First()) .OrderBy(f => f.Actor.Info.TraitInfo<ProductionInfo>().Produces.First())
.Select(b => b.Actor) .Select(b => b.Actor)
.ToList(); .ToList();