X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fcarfire;a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FMap.cs;h=bc3fbbf881de75701cdb62ef5388673300ff32ab;hp=ae49c8a8c3bc2f635329f3e57615de4069020cd5;hb=188525be158d8ba27fbbedf699eec5df59c5a2ee;hpb=d861be5538dfe866f867a6e237311ba6b743e863

diff --git a/CarFire/CarFire/CarFire/Map.cs b/CarFire/CarFire/CarFire/Map.cs
index ae49c8a..bc3fbbf 100644
--- a/CarFire/CarFire/CarFire/Map.cs
+++ b/CarFire/CarFire/CarFire/Map.cs
@@ -136,11 +136,7 @@ namespace CarFire
         /// character to coordinate mappings.  This effects what the map looks
         /// like when it is drawn.
         /// </summary>
-        public Tilemap Tilemap
-        {
-            get { return mData.Tilemap; }
-            set { mData.Tilemap = value; }
-        }
+        public static Tilemap Tilemap;
 
         /// <summary>
         /// Get and set the zoom of the map view.  The default zoom is
@@ -355,7 +351,6 @@ namespace CarFire
             public List<RawEntity> Entities { get { return mEntities; } }
             public Point[] PlayerPositions { get { return mPlayerPositions; } }
             public bool[,] Grid { get { return mBooleanGrid; } }
-            public Tilemap Tilemap;
 
 
             public Model(Metadata metadata, char[,] grid, char defaultTile,
@@ -365,6 +360,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;
@@ -542,14 +538,14 @@ namespace CarFire
 
             public void Draw(SpriteBatch spriteBatch)
             {
-                if (mData.Tilemap == null) throw new Exception("Cannot draw map without first setting the tilemap.");
+                if (Tilemap == null) throw new Exception("Cannot draw map without first setting the tilemap.");
                 mViewport = spriteBatch.GraphicsDevice.Viewport;
 
                 for (int y = 0; y < mData.Metadata.GridHeight; y++)
                 {
                     for (int x = 0; x < mData.Metadata.GridWidth; x++)
                     {
-                        mData.Tilemap.Draw(spriteBatch, mData.GetCell(x, y), GetRectangleFromCoordinates(x, y));
+                        Tilemap.Draw(spriteBatch, mData.GetCell(x, y), GetRectangleFromCoordinates(x, y));
                     }
                 }
             }