Removed an overload of Footprint.Tiles (see also next commit)
This commit is contained in:
@@ -7,11 +7,6 @@ namespace OpenRa.GameRules
|
||||
{
|
||||
static class Footprint
|
||||
{
|
||||
public static IEnumerable<int2> Tiles( string name, BuildingInfo buildingInfo, int2 position )
|
||||
{
|
||||
return Tiles(name, buildingInfo, position, true);
|
||||
}
|
||||
|
||||
public static IEnumerable<int2> Tiles( string name, BuildingInfo buildingInfo, int2 position, bool adjustForPlacement )
|
||||
{
|
||||
var dim = buildingInfo.Dimensions;
|
||||
|
||||
@@ -46,9 +46,10 @@ namespace OpenRa
|
||||
public void DrawBuildingGrid( string name, BuildingInfo bi )
|
||||
{
|
||||
var position = Game.controller.MousePosition.ToInt2();
|
||||
var topLeft = position - Footprint.AdjustForBuildingSize( bi );
|
||||
var isCloseEnough = Game.world.IsCloseEnoughToBase(Game.LocalPlayer, name, bi, position);
|
||||
|
||||
foreach( var t in Footprint.Tiles( name, bi, position ) )
|
||||
foreach( var t in Footprint.Tiles( name, bi, topLeft, false ) )
|
||||
spriteRenderer.DrawSprite( ( isCloseEnough && Game.world.IsCellBuildable( t, bi.WaterBound
|
||||
? UnitMovementType.Float : UnitMovementType.Wheel ) && !Game.world.Map.ContainsResource( t ) )
|
||||
? buildOk : buildBlocked, Game.CellSize * t, 0 );
|
||||
|
||||
@@ -125,7 +125,8 @@ namespace OpenRa
|
||||
ignoreTerrain = true,
|
||||
};
|
||||
|
||||
foreach (var t in Footprint.Tiles(buildingName, bi, position)) search.AddInitialCell(t);
|
||||
var topLeft = position - Footprint.AdjustForBuildingSize( bi );
|
||||
foreach (var t in Footprint.Tiles(buildingName, bi, topLeft, false)) search.AddInitialCell(t);
|
||||
|
||||
return world.PathFinder.FindPath(search).Count != 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user