colosseum is now crowded with monsters; made the SaberMonster moving code more robust...

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

diff --git a/CarFire/CarFire/CarFire/Game.cs b/CarFire/CarFire/CarFire/Game.cs
index f78945b65d21fc85bf8fe94624d4b2af6b16b621..56507110fac10ba1c10502be051f1cf11545dc1f 100644 (file)
--- a/CarFire/CarFire/CarFire/Game.cs
+++ b/CarFire/CarFire/CarFire/Game.cs
@@ -225,11 +225,17 @@ namespace CarFire
         {\r
             get\r
             {\r
-                bool[,] grid = State.Map.Grid;\r
+                bool[,] grid = (bool[,])State.Map.Grid.Clone();\r
                 foreach (IEntity entity in State.Entities)\r
                 {\r
                     Point coordinates = entity.Coordinates;\r
-                    if (State.Map.IsCellOpen(coordinates)) grid[coordinates.X, coordinates.Y] = false;\r
+                    grid[coordinates.X, coordinates.Y] = false;\r
+                }\r
+                foreach (Player player in State.mCharacters)\r
+                {\r
+                    if (player == null) continue;\r
+                    Point coordinates = player.Coordinates;\r
+                    grid[coordinates.X, coordinates.Y] = false;\r
                 }\r
                 return grid;\r
             }\r
@@ -279,6 +285,8 @@ namespace CarFire
             if (!State.Map.IsCellOpen(point)) return false;\r
             IEntity entity = GetEntityAtCoordinates(point);\r
             if (entity != null && entity.IsCollidable) return false;\r
+            Player player = GetPlayerAtCoordinates(point);\r
+            if (player != null) return false;\r
             return true;\r
         }\r
 \r
@@ -384,43 +392,43 @@ namespace CarFire
             // Load the tilemap.\r
             Texture2D mapTiles = mContentManager.Load<Texture2D>("graphics/wallAndFloorTilesNoEdgeScale");\r
             Tilemap tilemap = new Tilemap(mapTiles, 10, 7);\r
-            tilemap.SetTile(' ', new Point(4, 5), TileFlags.Default);\r
-            tilemap.SetTile('`', new Point(0, 1), TileFlags.Closed | TileFlags.Wall);\r
-            tilemap.SetTile('~', new Point(1, 1), TileFlags.Closed | TileFlags.Wall);\r
-            tilemap.SetTile('!', new Point(3, 1), TileFlags.Closed | TileFlags.Wall);\r
-            tilemap.SetTile('@', new Point(4, 1), TileFlags.Closed | TileFlags.Wall);\r
-            tilemap.SetTile('#', new Point(5, 1), TileFlags.Closed | TileFlags.Wall);\r
-            tilemap.SetTile('$', new Point(6, 1), TileFlags.Closed | TileFlags.Wall);\r
-            tilemap.SetTile('%', new Point(8, 1), TileFlags.Closed | TileFlags.Wall);\r
-            tilemap.SetTile('^', new Point(9, 1), TileFlags.Closed | TileFlags.Wall);\r
-            tilemap.SetTile('&', new Point(0, 2), TileFlags.Closed | TileFlags.Wall);\r
-            tilemap.SetTile('=', new Point(1, 2), TileFlags.Closed | TileFlags.Wall);\r
-            tilemap.SetTile('*', new Point(2, 2), TileFlags.Closed | TileFlags.Wall);\r
-            tilemap.SetTile('(', new Point(4, 2), TileFlags.Closed | TileFlags.Wall);\r
-            tilemap.SetTile(')', new Point(0, 3), TileFlags.Closed | TileFlags.Wall);\r
-            tilemap.SetTile('_', new Point(2, 3), TileFlags.Closed | TileFlags.Wall);\r
-            tilemap.SetTile('-', new Point(9, 3), TileFlags.Closed | TileFlags.Wall);\r
-            tilemap.SetTile(',', new Point(1, 4), TileFlags.Default);\r
-            tilemap.SetTile('+', new Point(2, 4), TileFlags.Default);\r
-            tilemap.SetTile('[', new Point(3, 4), TileFlags.Default);\r
-            tilemap.SetTile(']', new Point(4, 4), TileFlags.Default);\r
-            tilemap.SetTile('{', new Point(5, 4), TileFlags.Default);\r
-            tilemap.SetTile('}', new Point(6, 4), TileFlags.Default);\r
-            tilemap.SetTile('\\', new Point(8, 4), TileFlags.Default);\r
-            tilemap.SetTile('|', new Point(9, 4), TileFlags.Default);\r
-            tilemap.SetTile(';', new Point(0, 5), TileFlags.Default);\r
-            tilemap.SetTile(':', new Point(1, 5), TileFlags.Default);\r
+            tilemap.SetTile('`',  new Point(0, 2), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile('~',  new Point(1, 2), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile('!',  new Point(2, 2), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile('@',  new Point(3, 2), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile('#',  new Point(4, 2), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile('$',  new Point(5, 2), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile('%',  new Point(6, 2), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile('^',  new Point(8, 2), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile('&',  new Point(9, 2), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile('*',  new Point(0, 3), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile('(',  new Point(1, 3), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile(')',  new Point(2, 3), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile('-',  new Point(3, 3), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile('=',  new Point(4, 3), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile('_',  new Point(5, 3), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile('+',  new Point(6, 3), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile('|',  new Point(8, 3), TileFlags.Closed | TileFlags.Wall);\r
+            tilemap.SetTile('[',  new Point(0, 4), TileFlags.Default);\r
+            tilemap.SetTile(']',  new Point(1, 4), TileFlags.Default);\r
+            tilemap.SetTile('{',  new Point(2, 4), TileFlags.Default);\r
+            tilemap.SetTile('}',  new Point(3, 4), TileFlags.Default);\r
+            tilemap.SetTile('?',  new Point(4, 4), TileFlags.Default);\r
+            tilemap.SetTile(',',  new Point(7, 4), TileFlags.Default);\r
+            tilemap.SetTile('.',  new Point(8, 4), TileFlags.Default);\r
+            tilemap.SetTile('\\', new Point(9, 4), TileFlags.Default);\r
+            tilemap.SetTile(';',  new Point(0, 5), TileFlags.Default);\r
+            tilemap.SetTile(':',  new Point(1, 5), TileFlags.Default);\r
             tilemap.SetTile('\'', new Point(2, 5), TileFlags.Default);\r
-            tilemap.SetTile('"', new Point(3, 5), TileFlags.Default);\r
-            tilemap.SetTile('.', new Point(5, 5), TileFlags.Default);\r
-            tilemap.SetTile('<', new Point(6, 5), TileFlags.Default);\r
-            tilemap.SetTile('>', new Point(7, 5), TileFlags.Default);\r
-            tilemap.SetTile('/', new Point(8, 5), TileFlags.Default);\r
-            tilemap.SetTile('?', new Point(9, 5), TileFlags.Default);\r
+            tilemap.SetTile('"',  new Point(3, 5), TileFlags.Default);\r
+            tilemap.SetTile(' ',  new Point(4, 5), TileFlags.Default);\r
+            tilemap.SetTile('<',  new Point(7, 5), TileFlags.Default);\r
+            tilemap.SetTile('>',  new Point(8, 5), TileFlags.Default);\r
+            tilemap.SetTile('/',  new Point(9, 5), TileFlags.Default);\r
             Map.Tilemap = tilemap;\r
 \r
             // Load the first map.\r
-            State.Map = mContentManager.Load<Map>("Maps/level1");\r
+            State.Map = mContentManager.Load<Map>("Maps/colosseum");\r
             State.Entities = State.Map.GetAllEntities(this);\r
 \r
             //State.AIData = new AI(this);\r