X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FMap.cs;h=f3d59d4a705a6e2e341a0177cf4e87f23fb46f7f;hb=a67a04fbbf048dc08edd2ed726aa8c6da4c26a6b;hp=3b10663d089a9f06242b68aa0082625a40876cf5;hpb=2069ccccbb9dc0007f36555862615e684e93a8b2;p=chaz%2Fcarfire

diff --git a/CarFire/CarFire/CarFire/Map.cs b/CarFire/CarFire/CarFire/Map.cs
index 3b10663..f3d59d4 100644
--- a/CarFire/CarFire/CarFire/Map.cs
+++ b/CarFire/CarFire/CarFire/Map.cs
@@ -48,7 +48,7 @@ namespace CarFire
 
         #region Public Constants
 
-        public const float PixelsToUnitSquares = 8.0f;
+        public const float PixelsToUnitSquares = 60.0f;
 
         #endregion
 
@@ -58,7 +58,7 @@ namespace CarFire
         /// <summary>
         /// The type of a map helps determine how the map is intended to be used.
         /// </summary>
-        public enum Type
+        public enum Mode
         {
             None,
             Campaign,
@@ -71,7 +71,7 @@ namespace CarFire
         public class Metadata
         {
             public string Name;
-            public Type Type;
+            public Mode Type;
             public string Author;
             public HashSet<int> NumPlayers = new HashSet<int>();
             public string Tileset;
@@ -102,7 +102,7 @@ namespace CarFire
         /// <summary>
         /// Get the type of the map.
         /// </summary>
-        //public Type Type { get { return mData.mMetadata.Type; } }
+        public Mode Type { get { return mData.Metadata.Type; } }
 
         /// <summary>
         /// Get the author of the map.
@@ -151,10 +151,12 @@ namespace CarFire
         /// <summary>
         /// Construct a map with the provided map data.
         /// </summary>
-        /// <param name="data">Map data.</param>
-        public Map(Metadata metadata, char[,] grid, List<RawEntity> entities)
+        /// <param name="metadata">The metadata.</param>
+        /// <param name="grid">The grid.</param>
+        /// <param name="entities">The entities.</param>
+        public Map(Metadata metadata, char[,] grid, List<RawEntity> entities, Point[] playerPositions)
         {
-            mData = new Modal(metadata, grid, entities);
+            mData = new Modal(metadata, grid, entities, playerPositions);
             mView = new View(mData);
         }
 
@@ -234,6 +236,19 @@ namespace CarFire
         }
 
 
+        /// <summary>
+        /// Get the starting position of a player.
+        /// </summary>
+        /// <param name="playerNumber">The number of the player (i.e. 1-4).
+        /// This number must be a valid player number.</param>
+        /// <returns>The starting position of the player.</returns>
+        public Point GetStartingPositionForPlayer(int playerNumber)
+        {
+            Debug.Assert(1 <= playerNumber && playerNumber <= NumPlayers.Max());
+            return mData.PlayerPositions[playerNumber];
+        }
+
+
         /// <summary>
         /// Get all the entities loaded from the map file.  Exceptions could be
         /// thrown if there are entities without associated classes.
@@ -265,8 +280,9 @@ namespace CarFire
             Metadata mMetadata;
             char[,] mGrid;
             List<RawEntity> mEntities;
+            Point[] mPlayerPositions;
 
-            public Modal(Metadata metadata, char[,] grid, List<RawEntity> entities)
+            public Modal(Metadata metadata, char[,] grid, List<RawEntity> entities, Point[] playerPositions)
             {
                 Debug.Assert(metadata != null);
                 Debug.Assert(grid != null);
@@ -276,6 +292,7 @@ namespace CarFire
                 mMetadata = metadata;
                 mGrid = grid;
                 mEntities = entities;
+                mPlayerPositions = playerPositions;
 
 #if DEBUG
                 Console.WriteLine("Loaded map {0} of type {1} written by {2}.",
@@ -288,6 +305,7 @@ namespace CarFire
 
             public Metadata Metadata { get { return mMetadata; } }
             public List<RawEntity> Entities { get { return mEntities; } }
+            public Point[] PlayerPositions { get { return mPlayerPositions; } }
 
 
             public bool IsCellOpen(int x, int y)