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

rename AllowOreAt => AllowResourceAt

Browse Source
This commit is contained in:
Bob
2010-11-06 11:46:19 +13:00
parent 85a26ecdf7
commit 8fcbb670d8
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Traits/World/ResourceLayer.cs
View File

@@ -71,7 +71,7 @@ namespace OpenRA.Traits
for (int y = map.YOffset; y < map.YOffset + map.Height; y++) for (int y = map.YOffset; y < map.YOffset + map.Height; y++)
{ {
// Todo: Valid terrain should be specified in the resource // Todo: Valid terrain should be specified in the resource
if (!AllowOreAt(new int2(x,y))) if (!AllowResourceAt(new int2(x,y)))
continue; continue;
content[x, y].type = resourceTypes.FirstOrDefault( content[x, y].type = resourceTypes.FirstOrDefault(
@@ -89,7 +89,7 @@ namespace OpenRA.Traits
} }
} }
bool AllowOreAt( int2 a ) public bool AllowResourceAt( int2 a )
{ {
if( !world.Map.IsInMap( a.X, a.Y ) ) return false; if( !world.Map.IsInMap( a.X, a.Y ) ) return false;
if( !world.GetTerrainInfo( a ).Buildable ) return false; if( !world.GetTerrainInfo( a ).Buildable ) return false;

3
OpenRA.Mods.RA/SeedsResource.cs
View File

@@ -11,7 +11,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Render; using OpenRA.Mods.RA.Render;
using OpenRA.Traits; using OpenRA.Traits;
@@ -52,7 +51,7 @@ namespace OpenRA.Mods.RA
// Todo: Valid terrain should be specified in the resource // Todo: Valid terrain should be specified in the resource
if (cell != null && self.World.Map.IsInMap(cell.Value) && if (cell != null && self.World.Map.IsInMap(cell.Value) &&
(resLayer.GetResource(cell.Value) == resourceType (resLayer.GetResource(cell.Value) == resourceType
|| (resLayer.GetResource(cell.Value) == null && self.World.IsCellBuildable(cell.Value, false)))) || (resLayer.GetResource(cell.Value) == null && resLayer.AllowResourceAt(cell.Value))))
resLayer.AddResource(resourceType, cell.Value.X, cell.Value.Y, 1); resLayer.AddResource(resourceType, cell.Value.X, cell.Value.Y, 1);
ticks = info.Interval; ticks = info.Interval;