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

Remove unused tileset update/save code.

Browse Source
This commit is contained in:
Paul Chote
2018-10-23 13:07:50 +01:00
committed by Oliver Brakmann
parent 0fca984463
commit ad4b4dc7f8
3 changed files with 0 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
OpenRA.Game/Map/TileSet.cs
View File

@@ -30,36 +30,10 @@ namespace OpenRA
public readonly float ZOffset = 0.0f;
public readonly float ZRamp = 1.0f;
public MiniYaml Save(TileSet tileSet)
{
var root = new List<MiniYamlNode>();
if (Height != 0)
root.Add(FieldSaver.SaveField(this, "Height"));
if (RampType != 0)
root.Add(FieldSaver.SaveField(this, "RampType"));
if (LeftColor != tileSet.TerrainInfo[TerrainType].Color)
root.Add(FieldSaver.SaveField(this, "LeftColor"));
if (RightColor != tileSet.TerrainInfo[TerrainType].Color)
root.Add(FieldSaver.SaveField(this, "RightColor"));
if (ZOffset != 0.0f)
root.Add(FieldSaver.SaveField(this, "ZOffset"));
if (ZRamp != 1.0f)
root.Add(FieldSaver.SaveField(this, "ZRamp"));
return new MiniYaml(tileSet.TerrainInfo[TerrainType].Type, root);
}
}
public class TerrainTypeInfo
{
static readonly TerrainTypeInfo Default = new TerrainTypeInfo();
public readonly string Type;
public readonly BitSet<TargetableType> TargetTypes;
public readonly HashSet<string> AcceptsSmudgeType = new HashSet<string>();
@@ -67,18 +41,11 @@ namespace OpenRA
public readonly bool RestrictPlayerColor = false;
public readonly string CustomCursor;
// Private default ctor for serialization comparison
TerrainTypeInfo() { }
public TerrainTypeInfo(MiniYaml my) { FieldLoader.Load(this, my); }
public MiniYaml Save() { return FieldSaver.SaveDifferences(this, Default); }
}
public class TerrainTemplateInfo
{
static readonly TerrainTemplateInfo Default = new TerrainTemplateInfo(0, new string[] { null }, int2.Zero, null);
public readonly ushort Id;
public readonly string[] Images;
public readonly int[] Frames;
@@ -160,21 +127,6 @@ namespace OpenRA
{
get { return tileInfo.Length; }
}
public MiniYaml Save(TileSet tileSet)
{
var root = FieldSaver.SaveDifferences(this, Default);
var tileYaml = tileInfo
.Select((ti, i) => Pair.New(i.ToString(), ti))
.Where(t => t.Second != null)
.Select(t => new MiniYamlNode(t.First, t.Second.Save(tileSet)))
.ToList();
root.Nodes.Add(new MiniYamlNode("Tiles", null, tileYaml));
return root;
}
}
public class TileSet
@@ -197,9 +149,6 @@ namespace OpenRA
readonly Dictionary<string, byte> terrainIndexByType = new Dictionary<string, byte>();
readonly byte defaultWalkableTerrainIndex;
// Private default ctor for serialization comparison
TileSet() { }
public TileSet(IReadOnlyFileSystem fileSystem, string filepath)
{
var yaml = MiniYaml.FromStream(fileSystem.Open(filepath), filepath)
@@ -298,18 +247,5 @@ namespace OpenRA
return tpl.Contains(r.Index) ? tpl[r.Index] : null;
}
public void Save(string filepath)
{
var root = new List<MiniYamlNode>();
root.Add(new MiniYamlNode("General", FieldSaver.SaveDifferences(this, new TileSet())));
root.Add(new MiniYamlNode("Terrain", null,
TerrainInfo.Select(t => new MiniYamlNode("TerrainType@{0}".F(t.Type), t.Save())).ToList()));
root.Add(new MiniYamlNode("Templates", null,
Templates.Select(t => new MiniYamlNode("Template@{0}".F(t.Value.Id), t.Value.Save(this))).ToList()));
root.WriteToFile(filepath);
}
}
}