X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fcarfire;a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FMap.cs;h=504a68ce7f9dca706131c80835b2c67c3b1fcce1;hp=0e66b139221bf27d1206517e32461d3993fa879c;hb=08f41ef45f3c41ca6302150bc6d5270c8e7143db;hpb=3ca5852a7df47d4129743ed449816c7c7347b699

diff --git a/CarFire/CarFire/CarFire/Map.cs b/CarFire/CarFire/CarFire/Map.cs
index 0e66b13..504a68c 100644
--- a/CarFire/CarFire/CarFire/Map.cs
+++ b/CarFire/CarFire/CarFire/Map.cs
@@ -19,10 +19,6 @@ namespace CarFire
     /// </summary>
     public class Map
     {
-        // DEBUG: Tilesets not implemented at all.
-        public static Texture2D DefaultTile;
-
-
         #region Public Constants
 
         public const float PixelsToUnitSquares = 64.0f;
@@ -50,6 +46,7 @@ namespace CarFire
             public string Name;
             public Mode Type;
             public string Author;
+            public string Next;
             public HashSet<int> NumPlayers = new HashSet<int>();
             public string Tileset;
             public int GridWidth;
@@ -86,6 +83,11 @@ namespace CarFire
         /// </summary>
         public string Author { get { return mData.Metadata.Author; } }
 
+        /// <summary>
+        /// Get the name of the next map to load after this one.
+        /// </summary>
+        public string Next { get { return mData.Metadata.Next; } }
+
         /// <summary>
         /// Get a set of integers containing each allowable number of players.
         /// </summary>
@@ -101,7 +103,9 @@ namespace CarFire
         /// </summary>
         public int Height { get { return mData.Metadata.GridHeight; } }
 
-        // TODO: This should return whatever object we end up using for tilesets.
+        /// <summary>
+        /// Get the name of the tileset.
+        /// </summary>
         public string Tileset { get { return mData.Metadata.Tileset; } }
 
         /// <summary>
@@ -133,6 +137,15 @@ namespace CarFire
             set { mView.CenterCell = value; }
         }
 
+        /// <summary>
+        /// Get and set the tilemap with its associated texture and tile
+        /// character to coordinate mappings.  This effects what the map looks
+        /// like when it is drawn.  You will need to reset any map instances
+        /// after setting a new tilemap.  You should also set a tilemap before
+        /// instantiating any maps.
+        /// </summary>
+        public static Tilemap Tilemap;
+
         /// <summary>
         /// Get and set the zoom of the map view.  The default zoom is
         /// Map.PixelsToUnitSquares.
@@ -226,6 +239,16 @@ namespace CarFire
             return mData.IsCellOpen(x, y);
         }
 
+        /// <summary>
+        /// created by Brady for AI precalculations
+        /// </summary>
+        /// <param name="x">X-coordinate.</param>
+        /// <param name="y">Y-coordinate.</param>
+        public bool IsWall(int x, int y)
+        {
+            return mData.IsWall(x, y);
+        }
+
         /// <summary>
         /// Determine whether or not a cell can be occupied by a game entity.
         /// </summary>
@@ -345,6 +368,7 @@ namespace CarFire
                 Debug.Assert(grid != null);
                 Debug.Assert(entities != null);
                 Debug.Assert(metadata.GridWidth * metadata.GridHeight == grid.Length);
+                Debug.Assert(Tilemap != null);
 
                 mMetadata = metadata;
                 mCleanGrid = grid;
@@ -380,9 +404,15 @@ namespace CarFire
 
             public bool IsCellOpen(int x, int y)
             {
-                // TODO: Still need to define characters for types of scenery.
-                if (IsOnMap(x, y)) return mGrid[x, y] == ' ';
-                return false;
+                if (!IsOnMap(x, y)) return false;
+                return (Tilemap.GetTileFlags(mGrid[x, y]) & TileFlags.Open) == TileFlags.Open;
+            }
+
+            //created by Brady for AI precalculations
+            public bool IsWall(int x, int y)
+            {
+                if (!IsOnMap(x, y)) return false;
+                return (Tilemap.GetTileFlags(mGrid[x, y]) & TileFlags.Wall) == TileFlags.Wall;
             }
 
             public void SetCell(int x, int y, char tile)
@@ -394,6 +424,12 @@ namespace CarFire
                 }
             }
 
+            public char GetCell(int x, int y)
+            {
+                if (IsOnMap(x, y)) return mGrid[x, y];
+                return mDefaultTile;
+            }
+
             public void ClearCell(int x, int y)
             {
                 SetCell(x, y, mDefaultTile);
@@ -510,21 +546,14 @@ namespace CarFire
 
             public void Draw(SpriteBatch spriteBatch)
             {
+                if (Tilemap == null) throw new Exception("Cannot draw map without first setting the tilemap.");
                 mViewport = spriteBatch.GraphicsDevice.Viewport;
 
-                // TODO: There is no culling yet, but it runs so fast that it probably won't ever need it.
                 for (int y = 0; y < mData.Metadata.GridHeight; y++)
                 {
                     for (int x = 0; x < mData.Metadata.GridWidth; x++)
                     {
-                        if (mData.IsCellOpen(x, y))
-                        {
-                            spriteBatch.Draw(Map.DefaultTile, GetRectangleFromCoordinates(x, y), Color.White);
-                        }
-                        else
-                        {
-                            spriteBatch.Draw(Map.DefaultTile, GetRectangleFromCoordinates(x, y), Color.DarkBlue);
-                        }
+                        Tilemap.Draw(spriteBatch, mData.GetCell(x, y), GetRectangleFromCoordinates(x, y));
                     }
                 }
             }