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

Remove redundant MapStub fields.

Browse Source
This commit is contained in:
Paul Chote
2011-02-11 19:24:21 +13:00
parent c5d410938d
commit 4a7be2e0c8
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.FileFormats/Map/MapStub.cs
View File

@@ -42,25 +42,24 @@ namespace OpenRA.FileFormats
[FieldLoader.Load] public Rectangle Bounds; [FieldLoader.Load] public Rectangle Bounds;
// TODO: Remove these once we stop supporting MapFormat < 5
[FieldLoader.Load] public int2 TopLeft;
[FieldLoader.Load] public int2 BottomRight;
public MapStub() {} // Hack for the editor - not used for anything important public MapStub() {} // Hack for the editor - not used for anything important
public MapStub(string path) public MapStub(string path)
{ {
Path = path; Path = path;
Container = FileSystem.OpenPackage(path, int.MaxValue); Container = FileSystem.OpenPackage(path, int.MaxValue);
var yaml = MiniYaml.FromStream(Container.GetContent("map.yaml")); var yaml = new MiniYaml( null, MiniYaml.FromStream(Container.GetContent("map.yaml")) );
FieldLoader.Load( this, new MiniYaml( null, yaml ) ); FieldLoader.Load(this, yaml);
Uid = ComputeHash(); Uid = ComputeHash();
// Upgrade maps to define StartPoints // Upgrade maps to define StartPoints
if (MapFormat < 5) if (MapFormat < 5)
{ {
StartPoints = Waypoints.Select(kv => kv.Key).ToArray(); StartPoints = Waypoints.Select(kv => kv.Key).ToArray();
var TopLeft = (int2)FieldLoader.GetValue( "", typeof(int2), yaml.NodesDict["TopLeft"].Value);
var BottomRight = (int2)FieldLoader.GetValue( "", typeof(int2), yaml.NodesDict["BottomRight"].Value);
Bounds = Rectangle.FromLTRB(TopLeft.X, TopLeft.Y, BottomRight.X, BottomRight.Y); Bounds = Rectangle.FromLTRB(TopLeft.X, TopLeft.Y, BottomRight.X, BottomRight.Y);
} }
} }