X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fcarfire;a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FGame.cs;h=1486e6572a66eb31db5b6413620342eb58efe85b;hp=a2693671890f8bf1cf3a75150dd9921b14f273bc;hb=60d05271b295d2ca94a0028059add525c1bbffb1;hpb=d861be5538dfe866f867a6e237311ba6b743e863

diff --git a/CarFire/CarFire/CarFire/Game.cs b/CarFire/CarFire/CarFire/Game.cs
index a269367..1486e65 100644
--- a/CarFire/CarFire/CarFire/Game.cs
+++ b/CarFire/CarFire/CarFire/Game.cs
@@ -261,7 +261,8 @@ namespace CarFire
         public bool IsCellOpen(Point point)
         {
             if (!State.Map.IsCellOpen(point)) return false;
-            if (GetEntityAtCoordinates(point) != null) return false;
+            IEntity entity = GetEntityAtCoordinates(point);
+            if (entity != null && entity.IsCollidable) return false;
             return true;
         }
 
@@ -333,6 +334,7 @@ namespace CarFire
             State.mDisplay = new Display(this);
             State.mDisplay.LoadContent(mContentManager);
 
+            // Load the tilemap.
             Texture2D mapTiles = mContentManager.Load<Texture2D>("graphics/wallAndFloorTilesNoEdgeScale");
             Tilemap tilemap = new Tilemap(mapTiles, 10, 7);
             tilemap.SetTile(' ', new Point(4, 5), TileFlags.Default);
@@ -368,12 +370,13 @@ namespace CarFire
             tilemap.SetTile('>', new Point(7, 5), TileFlags.Default);
             tilemap.SetTile('/', new Point(8, 5), TileFlags.Default);
             tilemap.SetTile('?', new Point(9, 5), TileFlags.Default);
+            Map.Tilemap = tilemap;
 
+            // Load the first map.
             State.Map = mContentManager.Load<Map>("Maps/level1");
-            State.Map.Tilemap = tilemap;
             State.Entities = State.Map.GetAllEntities(this);
 
-            State.AIData = new AI(this);
+            //State.AIData = new AI(this);
 
             /*
             mPlayers.Clear();