Convert and store smudges in map

OpenRA.FileFormats/Map/Map.cs

@@ -40,6 +40,7 @@ namespace OpenRA.FileFormats
 		public string Tileset;
 
 		public Dictionary<string, ActorReference> Actors = new Dictionary<string, ActorReference>();
+		public List<SmudgeReference> Smudges = new List<SmudgeReference>();
 		public Dictionary<string, int2> Waypoints = new Dictionary<string, int2>();
 		public Dictionary<string, MiniYaml> Rules = new Dictionary<string, MiniYaml>();
 		
@@ -86,14 +87,21 @@ namespace OpenRA.FileFormats
 			// TODO: Players
 			
 			// Actors
-			foreach (var kv in yaml["Actors"].Nodes.ToPairs())
+			foreach (var kv in yaml["Actors"].Nodes)
 			{
-				string[] vals = kv.Second.Split(' ');
-				string[] loc = vals[2].Split(',');
-				var a = new ActorReference(vals[0], new int2(int.Parse(loc[0]),int.Parse(loc[1])) ,vals[1]);
-				Actors.Add(kv.First,a);
+				string[] vals = kv.Value.Value.Split(' ');
+				string[] loc = vals[1].Split(',');
+				var a = new ActorReference(vals[0], new int2(int.Parse(loc[0]),int.Parse(loc[1])) ,vals[2]);
+				Actors.Add(kv.Key,a);
 			}
 			
+			// Smudges
+			foreach (var kv in yaml["Smudges"].Nodes)
+			{
+				string[] vals = kv.Key.Split(' ');
+				string[] loc = vals[2].Split(',');
+				Smudges.Add(new SmudgeReference(vals[0], new int2(int.Parse(loc[0]),int.Parse(loc[1])) ,int.Parse(vals[1])));
+			}
 			// Rules
 			Rules = yaml["Rules"].Nodes;
 			
@@ -120,7 +128,7 @@ namespace OpenRA.FileFormats
 			}			
 			root.Add("Actors",MiniYaml.FromDictionary<string,ActorReference>(Actors));
 			root.Add("Waypoints",MiniYaml.FromDictionary<string,int2>(Waypoints));
-
+			root.Add("Smudges",MiniYaml.FromList<SmudgeReference>(Smudges));
 			// TODO: Players
 			root.Add("Rules",new MiniYaml(null,Rules));
 			SaveBinaryData(Path.Combine(filepath,"map.bin"));
@@ -229,6 +237,11 @@ namespace OpenRA.FileFormats
 			Console.WriteLine("Loaded Actors:");
 			foreach (var wp in Actors)
 				Console.WriteLine("\t{0} => {1} {2} {3}",wp.Key,wp.Value.Name, wp.Value.Owner,wp.Value.Location);
+			
+			Console.WriteLine("Loaded Smudges:");
+			foreach (var s in Smudges)
+				Console.WriteLine("\t{0} {1} {2}",s.Type,s.Location,s.Depth);
+			
 		}
 	}
 }

OpenRA.FileFormats/Map/SmudgeReference.cs

@@ -0,0 +1,41 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+namespace OpenRA.FileFormats
+{
+	public struct SmudgeReference
+	{
+		public readonly string Type;
+		public readonly int2 Location;
+		public readonly int Depth;
+		public SmudgeReference( string type, int2 location, int depth )
+		{
+			Type = type;
+			Location = location;
+			Depth = depth;
+		}
+		
+		public override string ToString ()
+		{
+			return string.Format("{0} {1},{2} {3}", Type, Location.X,Location.Y, Depth);
+		}
+
+	}
+}