Implemented map tiles; started new Key entity; added missing variables to Melee.cs...

[chaz/carfire] / CarFire / CarFire / CarFire / Game.cs

diff --git a/CarFire/CarFire/CarFire/Game.cs b/CarFire/CarFire/CarFire/Game.cs
index 45b79d16901a653e8bcd1038075c8766d7fc4086..c2a7aafadf8e0f58cea4b86fa33b07205e3101e9 100644 (file)
--- a/CarFire/CarFire/CarFire/Game.cs
+++ b/CarFire/CarFire/CarFire/Game.cs
@@ -329,9 +329,45 @@ namespace CarFire
             State.mDisplay = new Display(this);\r
             State.mDisplay.LoadContent(mContentManager);\r
 \r
+            Texture2D mapTiles = mContentManager.Load<Texture2D>("graphics/wallAndFloorTilesNoEdgeScale");\r
+            Tilemap tilemap = new Tilemap(mapTiles, 10, 7);\r
+            tilemap.SetTile(' ', new Point(4, 5));\r
+            tilemap.SetTile('`', new Point(0, 1));\r
+            tilemap.SetTile('~', new Point(1, 1));\r
+            tilemap.SetTile('!', new Point(3, 1));\r
+            tilemap.SetTile('@', new Point(4, 1));\r
+            tilemap.SetTile('#', new Point(5, 1));\r
+            tilemap.SetTile('$', new Point(6, 1));\r
+            tilemap.SetTile('%', new Point(8, 1));\r
+            tilemap.SetTile('^', new Point(9, 1));\r
+            tilemap.SetTile('&', new Point(0, 2));\r
+            tilemap.SetTile('=', new Point(1, 2));\r
+            tilemap.SetTile('*', new Point(2, 2));\r
+            tilemap.SetTile('(', new Point(4, 2));\r
+            tilemap.SetTile(')', new Point(0, 3));\r
+            tilemap.SetTile('_', new Point(2, 3));\r
+            tilemap.SetTile('-', new Point(9, 3));\r
+            tilemap.SetTile(',', new Point(1, 4));\r
+            tilemap.SetTile('+', new Point(2, 4));\r
+            tilemap.SetTile('[', new Point(3, 4));\r
+            tilemap.SetTile(']', new Point(4, 4));\r
+            tilemap.SetTile('{', new Point(5, 4));\r
+            tilemap.SetTile('}', new Point(6, 4));\r
+            tilemap.SetTile('\\', new Point(8, 4));\r
+            tilemap.SetTile('|', new Point(9, 4));\r
+            tilemap.SetTile(';', new Point(0, 5));\r
+            tilemap.SetTile(':', new Point(1, 5));\r
+            tilemap.SetTile('\'', new Point(2, 5));\r
+            tilemap.SetTile('"', new Point(3, 5));\r
+            tilemap.SetTile('.', new Point(5, 5));\r
+            tilemap.SetTile('<', new Point(6, 5));\r
+            tilemap.SetTile('>', new Point(7, 5));\r
+            tilemap.SetTile('/', new Point(8, 5));\r
+            tilemap.SetTile('?', new Point(9, 5));\r
+\r
             State.Map = mContentManager.Load<Map>("Maps/level1");\r
+            State.Map.Tilemap = tilemap;\r
             State.Entities = State.Map.GetAllEntities(this);\r
-            Map.DefaultTile = mContentManager.Load<Texture2D>("default");\r
 \r
             /*\r
             mPlayers.Clear();\r