fixed #1171 -- don't shade buildable things just because we're building something else

This commit is contained in:
Chris Forbes
2011-09-16 20:55:50 +12:00
parent c1f522db63
commit bc8f02375f

View File

@@ -51,6 +51,7 @@ namespace OpenRA.Mods.RA.Widgets
readonly WorldRenderer worldRenderer; readonly WorldRenderer worldRenderer;
readonly World world; readonly World world;
[ObjectCreator.UseCtor] [ObjectCreator.UseCtor]
public BuildPaletteWidget( [ObjectCreator.Param] World world, [ObjectCreator.Param] WorldRenderer worldRenderer ) public BuildPaletteWidget( [ObjectCreator.Param] World world, [ObjectCreator.Param] WorldRenderer worldRenderer )
{ {
@@ -213,7 +214,6 @@ namespace OpenRA.Mods.RA.Widgets
// Icons // Icons
string tooltipItem = null; string tooltipItem = null;
var isBuildingSomething = queue.CurrentItem() != null;
foreach (var item in allBuildables) foreach (var item in allBuildables)
{ {
var rect = new RectangleF(origin.X + x * 64, origin.Y + 48 * y, 64, 48); var rect = new RectangleF(origin.X + x * 64, origin.Y + 48 * y, 64, 48);
@@ -253,7 +253,7 @@ namespace OpenRA.Mods.RA.Widgets
} }
} }
else else
if (!buildableItems.Any(a => a.Name == item.Name) || isBuildingSomething) if (!buildableItems.Any(a => a.Name == item.Name))
overlayBits.Add(Pair.New(cantBuild.Image, drawPos)); overlayBits.Add(Pair.New(cantBuild.Image, drawPos));
var closureName = buildableItems.Any(a => a.Name == item.Name) ? item.Name : null; var closureName = buildableItems.Any(a => a.Name == item.Name) ? item.Name : null;