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

PBOG: remove the resource check and let IsCellBuildable() extension method handle it

Browse Source
This commit is contained in:
michaeldgg2
2025-06-14 17:37:11 +02:00
committed by Gustas Kažukauskas
parent d657a72107
commit 8833e95f21
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs
View File

@@ -88,7 +88,6 @@ namespace OpenRA.Mods.Common.Orders
readonly World world; readonly World world;
protected readonly ProductionQueue Queue; protected readonly ProductionQueue Queue;
readonly PlaceBuildingInfo placeBuildingInfo; readonly PlaceBuildingInfo placeBuildingInfo;
readonly IResourceLayer resourceLayer;
readonly Viewport viewport; readonly Viewport viewport;
readonly VariantWrapper[] variants; readonly VariantWrapper[] variants;
int variant; int variant;
@@ -98,7 +97,6 @@ namespace OpenRA.Mods.Common.Orders
Queue = queue; Queue = queue;
world = queue.Actor.World; world = queue.Actor.World;
placeBuildingInfo = queue.Actor.Owner.PlayerActor.Info.TraitInfo<PlaceBuildingInfo>(); placeBuildingInfo = queue.Actor.Owner.PlayerActor.Info.TraitInfo<PlaceBuildingInfo>();
resourceLayer = world.WorldActor.TraitOrDefault<IResourceLayer>();
viewport = worldRenderer.Viewport; viewport = worldRenderer.Viewport;
// Clear selection if using Left-Click Orders // Clear selection if using Left-Click Orders
@@ -294,12 +292,7 @@ namespace OpenRA.Mods.Common.Orders
{ {
var isCloseEnough = buildingInfo.IsCloseEnoughToBase(world, world.LocalPlayer, actorInfo, topLeft); var isCloseEnough = buildingInfo.IsCloseEnoughToBase(world, world.LocalPlayer, actorInfo, topLeft);
foreach (var t in buildingInfo.Tiles(topLeft)) foreach (var t in buildingInfo.Tiles(topLeft))
footprint.Add( footprint.Add(t, MakeCellType(isCloseEnough && world.IsCellBuildable(t, actorInfo, buildingInfo)));
t,
MakeCellType(
isCloseEnough &&
world.IsCellBuildable(t, actorInfo, buildingInfo) &&
(resourceLayer == null || resourceLayer.GetResource(t).Type == null)));
} }
return preview?.Render(wr, topLeft, footprint) ?? []; return preview?.Render(wr, topLeft, footprint) ?? [];