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

Removed an overload of Footprint.Tiles (see also next commit)

Browse Source
This commit is contained in:
Bob
2010-01-18 14:14:15 +13:00
parent c62944e492
commit aac9a01c49
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRa.Game/GameRules/Footprint.cs
View File

@@ -7,11 +7,6 @@ namespace OpenRa.GameRules
{ {
static class Footprint 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 ) public static IEnumerable<int2> Tiles( string name, BuildingInfo buildingInfo, int2 position, bool adjustForPlacement )
{ {
var dim = buildingInfo.Dimensions; var dim = buildingInfo.Dimensions;

3
OpenRa.Game/UiOverlay.cs
View File

@@ -46,9 +46,10 @@ namespace OpenRa
public void DrawBuildingGrid( string name, BuildingInfo bi ) public void DrawBuildingGrid( string name, BuildingInfo bi )
{ {
var position = Game.controller.MousePosition.ToInt2(); var position = Game.controller.MousePosition.ToInt2();
var topLeft = position - Footprint.AdjustForBuildingSize( bi );
var isCloseEnough = Game.world.IsCloseEnoughToBase(Game.LocalPlayer, name, bi, position); 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 spriteRenderer.DrawSprite( ( isCloseEnough && Game.world.IsCellBuildable( t, bi.WaterBound
? UnitMovementType.Float : UnitMovementType.Wheel ) && !Game.world.Map.ContainsResource( t ) ) ? UnitMovementType.Float : UnitMovementType.Wheel ) && !Game.world.Map.ContainsResource( t ) )
? buildOk : buildBlocked, Game.CellSize * t, 0 ); ? buildOk : buildBlocked, Game.CellSize * t, 0 );

3
OpenRa.Game/WorldUtils.cs
View File

@@ -125,7 +125,8 @@ namespace OpenRa
ignoreTerrain = true, 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; return world.PathFinder.FindPath(search).Count != 0;
} }