X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FMapReader.cs;h=ae03ff9ea7b607aa7055cf411c86fa35031d25d5;hb=f74a6d5893ee639cb45c2190605145365781e6eb;hp=cfb1f945219cb1bf73e315957bee1cc0fd7285f4;hpb=722dcd763d115992b2a56d4001db80d11e583064;p=chaz%2Fcarfire

diff --git a/CarFire/CarFire/CarFire/MapReader.cs b/CarFire/CarFire/CarFire/MapReader.cs
index cfb1f94..ae03ff9 100644
--- a/CarFire/CarFire/CarFire/MapReader.cs
+++ b/CarFire/CarFire/CarFire/MapReader.cs
@@ -96,7 +96,7 @@ namespace CarFire
 
             public Map GetMap()
             {
-                return new Map(mMetadata, mGrid, mEntities);
+                return new Map(mMetadata, mGrid, mDefaultTile, mEntities, mPlayerPositions);
             }
 
 
@@ -312,7 +312,7 @@ namespace CarFire
                     if (mPlayerPositions[i] == default(Point))
                     {
                         throw new ParserException("Not enough player positions were defined on the grid; " +
-                            "are missing a spot for player " + i + ".");
+                            "you are missing a spot for player " + i + ".");
                     }
                 }
             }
@@ -347,8 +347,8 @@ namespace CarFire
 
             public void set_type(string atom)
             {
-                Map.Type value = Parse.Constant<Map.Type>(atom);
-                if (value != default(Map.Type)) mMetadata.Type = value;
+                Map.Mode value = Parse.Constant<Map.Mode>(atom);
+                if (value != default(Map.Mode)) mMetadata.Type = value;
                 else throw new ParserException("Unexpected type on line " + mInput.LineNumber + ": " + atom);
             }
 
@@ -425,10 +425,9 @@ namespace CarFire
             char[,] mGrid;
             List<Map.RawEntity> mEntities;
             Point[] mPlayerPositions;
-
-            Dictionary<char, Dictionary<string, string>> mEntitySections = new Dictionary<char, Dictionary<string, string>>();
             char mDefaultTile = ' ';
 
+            Dictionary<char, Dictionary<string, string>> mEntitySections = new Dictionary<char, Dictionary<string, string>>();
             LineReader mInput;
         }