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

Fix naming

Browse Source
This commit is contained in:
Paul Chote
2010-03-21 19:24:30 +13:00
parent a4c3ef7e38
commit a489b4aa56
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.FileFormats/TileSet.cs
View File

@@ -72,7 +72,7 @@ namespace OpenRA.FileFormats
string tilename = string.Format(pattern, i + 1); string tilename = string.Format(pattern, i + 1);
if (!walk.ContainsKey((ushort)(start + i))) if (!walk.ContainsKey((ushort)(start + i)))
walk.Add((ushort)(start + i), Walkability.GetTerrainType(tilename)); walk.Add((ushort)(start + i), Walkability.GetTileTemplate(tilename));
using( Stream s = FileSystem.Open( tilename + "." + suffix ) ) using( Stream s = FileSystem.Open( tilename + "." + suffix ) )
{ {

8
OpenRA.FileFormats/Walkability.cs
View File

@@ -50,7 +50,7 @@ namespace OpenRA.FileFormats
public class Walkability public class Walkability
{ {
Dictionary<string, TileTemplate> walkability Dictionary<string, TileTemplate> templates
= new Dictionary<string,TileTemplate>(); = new Dictionary<string,TileTemplate>();
public Walkability(string templatesFile) public Walkability(string templatesFile)
@@ -77,13 +77,13 @@ namespace OpenRA.FileFormats
tile.Index = -1; tile.Index = -1;
int.TryParse(section.Name.Substring(3), out tile.Index); int.TryParse(section.Name.Substring(3), out tile.Index);
walkability[tile.Name] = tile; templates[tile.Name] = tile;
} }
} }
public TileTemplate GetTerrainType(string terrainName) public TileTemplate GetTileTemplate(string terrainName)
{ {
return walkability[terrainName]; return templates[terrainName];
} }
} }
} }

2
OpenRA.Game/Traits/Bridge.cs
View File

@@ -97,7 +97,7 @@ namespace OpenRA.Traits
var numStates = self.Info.Traits.Get<BridgeInfo>().Long ? 6 : 3; var numStates = self.Info.Traits.Get<BridgeInfo>().Long ? 6 : 3;
for (var n = 0; n < numStates; n++) for (var n = 0; n < numStates; n++)
{ {
var stateTemplate = world.TileSet.Walkability.GetTerrainType(NameFromState(template, n)); var stateTemplate = world.TileSet.Walkability.GetTileTemplate(NameFromState(template, n));
Templates.Add( stateTemplate ); Templates.Add( stateTemplate );
TileSprites.Add(replacedTiles.ToDictionary( TileSprites.Add(replacedTiles.ToDictionary(