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

diff --git a/CarFire/CarFire/CarFire/Map.cs b/CarFire/CarFire/CarFire/Map.cs
index 3b10663..6727133 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.
@@ -128,14 +128,27 @@ namespace CarFire
         public string Tileset { get { return mData.Metadata.Tileset; } }
 
         /// <summary>
-        /// Get a list of the raw entity containers loaded with the map.
+        /// Get the current grid of open cells.  On the grid, true means
+        /// the cell is open (i.e. an entity can occupy that cell), and false
+        /// means the cell is closed.  Note that, just like Map.IsCellOpen,
+        /// only static scenery is considered; the grid cannot tell you
+        /// whether or not an entity is already occupying the cell.
+        /// </summary>
+        public bool[,] Grid { get { return mData.Grid; } }
+
+        /// <summary>
+        /// Get a list of the raw entity containers loaded with the map.  If you
+        /// want to get the actual entity objects, use Map.GetEntities and
+        /// Map.GetAllEntities instead.
         /// </summary>
         public List<RawEntity> RawEntities { get { return mData.Entities; } }
 
 
         /// <summary>
         /// Get and set the coordinate of the grid cell that should be in
-        /// the center of the screen when the map is drawn.
+        /// the center of the screen when the map is drawn.  Setting this
+        /// will change the viewport of the map and will effect the return
+        /// values of Map.GetPointFromCoordinates and Map.GetRectangleFromCoordinates.
         /// </summary>
         public Vector2 CenterCell
         {
@@ -151,10 +164,13 @@ 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, char defaultTile,
+            List<RawEntity> entities, Point[] playerPositions)
         {
-            mData = new Modal(metadata, grid, entities);
+            mData = new Modal(metadata, grid, defaultTile, entities, playerPositions);
             mView = new View(mData);
         }
 
@@ -234,6 +250,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.
@@ -255,6 +284,48 @@ namespace CarFire
             return mData.GetEntities<T>();
         }
 
+
+        /// <summary>
+        /// Set the tile of a cell.
+        /// </summary>
+        /// <param name="x">X-coordinate.</param>
+        /// <param name="y">Y-coordinate.</param>
+        /// <param name="tile">The character representing the tile.</param>
+        public void SetCell(int x, int y, char tile)
+        {
+            mData.SetCell(x, y, tile);
+        }
+
+        /// <summary>
+        /// Set the tile of a cell.
+        /// </summary>
+        /// <param name="point">X,Y-coordinates.</param>
+        /// <param name="tile">The character representing the tile.</param>
+        public void SetCell(Point point, char tile)
+        {
+            mData.SetCell(point.X, point.Y, tile);
+        }
+
+
+        /// <summary>
+        /// Clear a cell to the default tile.
+        /// </summary>
+        /// <param name="x">X-coordinate.</param>
+        /// <param name="y">Y-coordinate.</param>
+        public void ClearCell(int x, int y)
+        {
+            mData.ClearCell(x, y);
+        }
+
+        /// <summary>
+        /// Clear a cell to the default tile.
+        /// </summary>
+        /// <param name="point">X,Y-coordinates.</param>
+        public void ClearCell(Point point)
+        {
+            mData.ClearCell(point.X, point.Y);
+        }
+
         #endregion
 
 
@@ -264,9 +335,13 @@ namespace CarFire
         {
             Metadata mMetadata;
             char[,] mGrid;
+            char mDefaultTile;
             List<RawEntity> mEntities;
+            Point[] mPlayerPositions;
+            bool[,] mBooleanGrid;
 
-            public Modal(Metadata metadata, char[,] grid, List<RawEntity> entities)
+            public Modal(Metadata metadata, char[,] grid, char defaultTile,
+                List<RawEntity> entities, Point[] playerPositions)
             {
                 Debug.Assert(metadata != null);
                 Debug.Assert(grid != null);
@@ -275,7 +350,18 @@ namespace CarFire
 
                 mMetadata = metadata;
                 mGrid = grid;
+                mDefaultTile = defaultTile;
                 mEntities = entities;
+                mPlayerPositions = playerPositions;
+
+                mBooleanGrid = new bool[mMetadata.GridWidth, mMetadata.GridHeight];
+                for (int x = 0; x < mMetadata.GridWidth; x++)
+                {
+                    for (int y = 0; y < mMetadata.GridHeight; y++)
+                    {
+                        mBooleanGrid[x, y] = IsCellOpen(x, y);
+                    }
+                }
 
 #if DEBUG
                 Console.WriteLine("Loaded map {0} of type {1} written by {2}.",
@@ -288,6 +374,8 @@ namespace CarFire
 
             public Metadata Metadata { get { return mMetadata; } }
             public List<RawEntity> Entities { get { return mEntities; } }
+            public Point[] PlayerPositions { get { return mPlayerPositions; } }
+            public bool[,] Grid { get { return mBooleanGrid; } }
 
 
             public bool IsCellOpen(int x, int y)
@@ -296,6 +384,17 @@ namespace CarFire
                 return mGrid[x, y] == ' ';
             }
 
+            public void SetCell(int x, int y, char tile)
+            {
+                mGrid[x, y] = tile;
+                mBooleanGrid[x, y] = IsCellOpen(x, y);
+            }
+
+            public void ClearCell(int x, int y)
+            {
+                SetCell(x, y, mDefaultTile);
+            }
+
 
             public List<object> GetAllEntities()
             {