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

Merge pull request #5411 from RoosterDragon/general-clean

Browse Source 
General Cleanup
This commit is contained in:
Chris Forbes
2014-05-25 11:03:03 +12:00
parent 51b70777bd b733465f33
commit 5eb61dbdd2
92 changed files with 177 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Widgets/WidgetLoader.cs
View File

@@ -71,7 +71,7 @@ namespace OpenRA
return widget;
}
Widget NewWidget(string widgetType, WidgetArgs args)
static Widget NewWidget(string widgetType, WidgetArgs args)
{
widgetType = widgetType.Split('@')[0];
return Game.modData.ObjectCreator.CreateObject<Widget>(widgetType + "Widget", args);

2
OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs
View File

@@ -229,7 +229,7 @@ namespace OpenRA.Widgets
return false;
}
IEnumerable<Actor> SelectActorsInBox(World world, int2 a, int2 b, Func<Actor, bool> cond)
static IEnumerable<Actor> SelectActorsInBox(World world, int2 a, int2 b, Func<Actor, bool> cond)
{
return world.ScreenMap.ActorsInBox(a, b)
.Where(x => x.HasTrait<Selectable>() && x.Trait<Selectable>().Info.Selectable && !world.FogObscures(x) && cond(x))