git-svn-id: https://bd85.net/svn/cs3505_group@115 92bb83a3-7c8f-8a45-bc97-515c4e399668

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

diff --git a/CarFire/CarFire/CarFire/Display.cs b/CarFire/CarFire/CarFire/Display.cs
index fc2489530e8f53caea9de9b88f5f8ff99be9fb78..9e06485af34a242af1bc86187e68eb02637eeba8 100644 (file)
--- a/CarFire/CarFire/CarFire/Display.cs
+++ b/CarFire/CarFire/CarFire/Display.cs
@@ -51,22 +51,6 @@ namespace CarFire
             mMap = contentManager.Load<Map>("Maps/stable");\r
             Map.DefaultTile = contentManager.Load<Texture2D>("default");\r
             mMap.CenterCell = new Vector2(currentCenterX,currentCenterY);\r
-            //Debugging... Spawn eight projectiles.\r
-            //Diagonals\r
-            /*\r
-            mProjectiles.Add(new Projectile(mMap, everything, new Vector2(5,5), 10, 10, 300, 300));\r
-            mProjectiles.Add(new Projectile(mMap, everything, new Vector2(-5, 5), 10, 10, 300, 300));\r
-            mProjectiles.Add(new Projectile(mMap, everything, new Vector2(5, -5), 10, 10, 300, 300));\r
-            mProjectiles.Add(new Projectile(mMap, everything, new Vector2(-5, -5), 10, 10, 300, 300));\r
-            //Vertical and horizontal\r
-            mProjectiles.Add(new Projectile(mMap, everything, new Vector2(0, 5), 10, 10, 300, 300));\r
-            mProjectiles.Add(new Projectile(mMap, everything, new Vector2(-5, 0), 10, 10, 300, 300));\r
-            mProjectiles.Add(new Projectile(mMap, everything, new Vector2(5, 0), 10, 10, 300, 300));\r
-            mProjectiles.Add(new Projectile(mMap, everything, new Vector2(0, -5), 10, 10, 300, 300));\r
-            */\r
-\r
-            \r
-            // TODO: use this.Content to load your game content here\r
         }\r
 \r
         /// <summary>\r
@@ -133,7 +117,7 @@ namespace CarFire
                 if(mCharacters[j] != null)\r
                 for (int i = 0; i < mProjectiles.Count; i++)\r
                 {\r
-                    if (mProjectiles[i].GridX == mCharacters[j].GridX && mProjectiles[i].GridY == mCharacters[j].GridY)\r
+                    if (mProjectiles[i].GridX == mCharacters[j].Coordinates.X && mProjectiles[i].GridY == mCharacters[j].Coordinates.Y)\r
                     {\r
                         mCharacters[j].causeDamageTo(mProjectiles[i].Damage);\r
                         Console.WriteLine(mCharacters[j].Health);\r
@@ -150,20 +134,22 @@ namespace CarFire
                 {\r
                     if (state.keysDown[i].Contains(Keys.Enter))\r
                     {\r
-                        mCharacters[i] = (new Human(mMap, "", everything, projectile1, this));\r
-                        mCharacters[i].GridX = mMap.GetStartingPositionForPlayer(i + 1).X;\r
-                        mCharacters[i].GridY = mMap.GetStartingPositionForPlayer(i + 1).Y;\r
+                        mCharacters[i] = new Human(mMap, "", everything, projectile1, this, mMap.GetStartingPositionForPlayer(i+1));\r
                     }\r
                 }\r
                 //Regular player input updates\r
                 else\r
                 {\r
 \r
-                    mCharacters[i].MovePlayer(state.keysDown[i]);\r
-                    mMap.CenterCell = new Vector2(mCharacters[0].GridX, mCharacters[0].GridY);\r
+                    mCharacters[i].MovePlayer(timespan, state.keysDown[i]);\r
+                   \r
                 }\r
             }\r
-            //Handle wall collisions of projectiles again...\r
+            if (mCharacters[0] != null)\r
+            {\r
+                mMap.CenterCell = mCharacters[0].Position;\r
+            }\r
+                //Handle wall collisions of projectiles again...\r
             for (int i = 0; i < mProjectiles.Count; i++)\r
             {\r
                 if (!mMap.IsCellOpen(new Point(mProjectiles[i].GridX, mProjectiles[i].GridY)))\r
@@ -190,13 +176,17 @@ namespace CarFire
             foreach(Projectile projectile in mProjectiles)\r
             {\r
                 projectile.Draw(spriteBatch);\r
-                \r
             }\r
             for(int i = 0; i < 4; i++)//IPlayer character in mCharacters)\r
             {\r
-                if(mCharacters[i] != null)\r
+\r
+                if (mCharacters[i] != null)\r
+                {\r
                     mCharacters[i].Draw(spriteBatch);\r
-            } \r
+                    \r
+                }\r
+            }\r
+            \r
         }\r
         /// <summary>\r
         /// Add a projectile to the Display.\r