X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FGame.cs;h=f91882e047c08f85e578ec0e3716d3cce5986d9d;hb=398bc41a3075cfa9c9ad5dc607a86c56a4e7e913;hp=45b79d16901a653e8bcd1038075c8766d7fc4086;hpb=d167160264cd2c33de81a71039eddbb959c40bb2;p=chaz%2Fcarfire

diff --git a/CarFire/CarFire/CarFire/Game.cs b/CarFire/CarFire/CarFire/Game.cs
index 45b79d1..f91882e 100644
--- a/CarFire/CarFire/CarFire/Game.cs
+++ b/CarFire/CarFire/CarFire/Game.cs
@@ -27,7 +27,7 @@ namespace CarFire
         public List<Projectile> mProjectiles = new List<Projectile>();
         public Player[] mCharacters;
         public Display mDisplay;
-
+        public AI AIData;
         #endregion
 
 
@@ -329,9 +329,47 @@ namespace CarFire
             State.mDisplay = new Display(this);
             State.mDisplay.LoadContent(mContentManager);
 
+            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));
+
             State.Map = mContentManager.Load<Map>("Maps/level1");
+            State.Map.Tilemap = tilemap;
             State.Entities = State.Map.GetAllEntities(this);
-            Map.DefaultTile = mContentManager.Load<Texture2D>("default");
+
+            State.AIData = new AI(this);
 
             /*
             mPlayers.Clear();