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

diff --git a/CarFire/CarFire/CarFire/Game.cs b/CarFire/CarFire/CarFire/Game.cs
index e42a827..1486e65 100644
--- a/CarFire/CarFire/CarFire/Game.cs
+++ b/CarFire/CarFire/CarFire/Game.cs
@@ -31,7 +31,7 @@ namespace CarFire
         public List<Projectile> mProjectiles = new List<Projectile>();
         public Player[] mCharacters;
         public Display mDisplay;
-        //public AI AIData;
+        public AI AIData;
         #endregion
 
 
@@ -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,44 +334,46 @@ 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));
-            tilemap.SetTile('`', new Point(0, 1));
-            tilemap.SetTile('~', new Point(1, 1));
-            tilemap.SetTile('!', new Point(3, 1));
-            tilemap.SetTile('@', new Point(4, 1));
-            tilemap.SetTile('#', new Point(5, 1));
-            tilemap.SetTile('$', new Point(6, 1));
-            tilemap.SetTile('%', new Point(8, 1));
-            tilemap.SetTile('^', new Point(9, 1));
-            tilemap.SetTile('&', new Point(0, 2));
-            tilemap.SetTile('=', new Point(1, 2));
-            tilemap.SetTile('*', new Point(2, 2));
-            tilemap.SetTile('(', new Point(4, 2));
-            tilemap.SetTile(')', new Point(0, 3));
-            tilemap.SetTile('_', new Point(2, 3));
-            tilemap.SetTile('-', new Point(9, 3));
-            tilemap.SetTile(',', new Point(1, 4));
-            tilemap.SetTile('+', new Point(2, 4));
-            tilemap.SetTile('[', new Point(3, 4));
-            tilemap.SetTile(']', new Point(4, 4));
-            tilemap.SetTile('{', new Point(5, 4));
-            tilemap.SetTile('}', new Point(6, 4));
-            tilemap.SetTile('\\', new Point(8, 4));
-            tilemap.SetTile('|', new Point(9, 4));
-            tilemap.SetTile(';', new Point(0, 5));
-            tilemap.SetTile(':', new Point(1, 5));
-            tilemap.SetTile('\'', new Point(2, 5));
-            tilemap.SetTile('"', new Point(3, 5));
-            tilemap.SetTile('.', new Point(5, 5));
-            tilemap.SetTile('<', new Point(6, 5));
-            tilemap.SetTile('>', new Point(7, 5));
-            tilemap.SetTile('/', new Point(8, 5));
-            tilemap.SetTile('?', new Point(9, 5));
-
+            tilemap.SetTile(' ', new Point(4, 5), TileFlags.Default);
+            tilemap.SetTile('`', new Point(0, 1), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile('~', new Point(1, 1), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile('!', new Point(3, 1), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile('@', new Point(4, 1), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile('#', new Point(5, 1), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile('$', new Point(6, 1), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile('%', new Point(8, 1), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile('^', new Point(9, 1), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile('&', new Point(0, 2), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile('=', new Point(1, 2), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile('*', new Point(2, 2), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile('(', new Point(4, 2), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile(')', new Point(0, 3), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile('_', new Point(2, 3), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile('-', new Point(9, 3), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile(',', new Point(1, 4), TileFlags.Default);
+            tilemap.SetTile('+', new Point(2, 4), TileFlags.Default);
+            tilemap.SetTile('[', new Point(3, 4), TileFlags.Default);
+            tilemap.SetTile(']', new Point(4, 4), TileFlags.Default);
+            tilemap.SetTile('{', new Point(5, 4), TileFlags.Default);
+            tilemap.SetTile('}', new Point(6, 4), TileFlags.Default);
+            tilemap.SetTile('\\', new Point(8, 4), TileFlags.Default);
+            tilemap.SetTile('|', new Point(9, 4), TileFlags.Default);
+            tilemap.SetTile(';', new Point(0, 5), TileFlags.Default);
+            tilemap.SetTile(':', new Point(1, 5), TileFlags.Default);
+            tilemap.SetTile('\'', new Point(2, 5), TileFlags.Default);
+            tilemap.SetTile('"', new Point(3, 5), TileFlags.Default);
+            tilemap.SetTile('.', new Point(5, 5), TileFlags.Default);
+            tilemap.SetTile('<', new Point(6, 5), TileFlags.Default);
+            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);