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

diff --git a/CarFire/CarFire/CarFire/Map.cs b/CarFire/CarFire/CarFire/Map.cs
index 1b8b5a8..504a68c 100644
--- a/CarFire/CarFire/CarFire/Map.cs
+++ b/CarFire/CarFire/CarFire/Map.cs
@@ -46,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;
@@ -82,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>
@@ -134,13 +140,11 @@ namespace CarFire
         /// <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.
+        /// 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 Tilemap Tilemap
-        {
-            get { return mView.Tilemap; }
-            set { mView.Tilemap = value; }
-        }
+        public static Tilemap Tilemap;
 
         /// <summary>
         /// Get and set the zoom of the map view.  The default zoom is
@@ -364,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;
@@ -399,17 +404,17 @@ 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 (mGrid[x, y] == '-' || mGrid[x, y] == '|' || mGrid[x, y] == '+' || mGrid[x, y] == '/' || mGrid[x, y] == '\\');
-                return false;
+                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)
             {
                 if (IsOnMap(x, y))
@@ -520,7 +525,6 @@ namespace CarFire
         class View
         {
             public Vector2 CenterCell;
-            public Tilemap Tilemap;
             public float Zoom;