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

Merge pull request #9540 from obrakmann/fix9530

Browse Source 
Fix H and Home keys not working when the shroud debug option is enabled
This commit is contained in:
Matthias Mailänder
2015-10-04 20:49:53 +02:00
parent 044e562457 f98a55c72f
commit 1a8ec3745b
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -191,8 +191,10 @@ namespace OpenRA.Mods.Common.Widgets
bool CycleBases()
{
var player = world.RenderPlayer ?? world.LocalPlayer;
var bases = world.ActorsWithTrait<BaseBuilding>()
.Where(a => a.Actor.Owner == world.RenderPlayer)
.Where(a => a.Actor.Owner == player)
.Select(b => b.Actor)
.ToList();
@@ -201,7 +203,7 @@ namespace OpenRA.Mods.Common.Widgets
{
var building = world.ActorsWithTrait<Building>()
.Select(b => b.Actor)
.FirstOrDefault(a => a.Owner == world.RenderPlayer && a.Info.HasTraitInfo<SelectableInfo>());
.FirstOrDefault(a => a.Owner == player && a.Info.HasTraitInfo<SelectableInfo>());
// No buildings left
if (building == null)
@@ -226,8 +228,10 @@ namespace OpenRA.Mods.Common.Widgets
bool CycleProductionBuildings()
{
var player = world.RenderPlayer ?? world.LocalPlayer;
var facilities = world.ActorsWithTrait<Production>()
.Where(a => a.Actor.Owner == world.RenderPlayer && !a.Actor.Info.HasTraitInfo<BaseBuildingInfo>())
.Where(a => a.Actor.Owner == player && !a.Actor.Info.HasTraitInfo<BaseBuildingInfo>())
.OrderBy(f => f.Actor.Info.TraitInfo<ProductionInfo>().Produces.First())
.Select(b => b.Actor)
.ToList();