X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FDisplay.cs;h=ed6ab458cabdb91c1e2df54570d533e040846f03;hb=d0bdd76b2cfd38fe985a7493f42b5d6e0f79ac91;hp=98f91ed45eeeb9243301e05d35478b7a32545cf5;hpb=89e5ee7d83cfb353b6c98dcbf6ed6b87833b9866;p=chaz%2Fcarfire

diff --git a/CarFire/CarFire/CarFire/Display.cs b/CarFire/CarFire/CarFire/Display.cs
index 98f91ed..ed6ab45 100644
--- a/CarFire/CarFire/CarFire/Display.cs
+++ b/CarFire/CarFire/CarFire/Display.cs
@@ -15,7 +15,7 @@ namespace CarFire
     public class Display
     {
         List<Projectile> mProjectiles = new List<Projectile>();
-        List<Character> mCharacters = new List<Character>();
+        List<IPlayer> mCharacters = new List<IPlayer>();
         Map mMap;
         int currentCenterX = 5;
         int currentCenterY = 5;
@@ -49,6 +49,7 @@ namespace CarFire
             mProjectiles.Add(new Projectile(mMap, everything, new Vector2(5, 0), 10, 10, 300, 300));
             mProjectiles.Add(new Projectile(mMap, everything, new Vector2(0, -5), 10, 10, 300, 300));
 
+            
             // TODO: use this.Content to load your game content here
         }
 
@@ -68,22 +69,28 @@ namespace CarFire
         /// <param name="gameTime">Provides a snapshot of timing values.</param>
         public void Update(TimeSpan timespan)
         {
-            mMap.CenterCell = new Vector2(currentCenterX, currentCenterY);
-            foreach (Projectile projectile in mProjectiles)
+
+            for (int i = 0; i < mProjectiles.Count; i++ )
             {
-                projectile.Update(timespan);
+                mProjectiles[i].Update(timespan);
+                if (!mMap.IsCellOpen(new Point(mProjectiles[i].GridX, mProjectiles[i].GridY)))
+                {
+               
+                    mProjectiles.RemoveAt(i);
+                    i--;
+                }
             }
             //Check for collisons
-            foreach (Character character in mCharacters)
+            for (int j = 0; j < mCharacters.Count; j++) 
             {
-                foreach (Projectile projectile in mProjectiles)
+                for (int i = 0; i < mProjectiles.Count; i++)
                 {
-                    if (projectile.GridX == character.GridX && projectile.GridY == character.GridY)
+                    if (mProjectiles[i].GridX == mCharacters[j].GridX && mProjectiles[i].GridY == mCharacters[j].GridY)
                     {
                         //Debug - not sure if you can remove while doing for each
                         //Alternative - while loop, and decrement projectile counter if projectile is removed.
-                        mProjectiles.Remove(projectile);
-                        character.Health -= projectile.Damage;
+                        mProjectiles.Remove(mProjectiles[i]);
+                        mCharacters[j].causeDamageTo(mProjectiles[i].Damage);
                     }
                 }
             }
@@ -98,15 +105,21 @@ namespace CarFire
             mMap.Draw(spriteBatch);
             foreach(Projectile projectile in mProjectiles)
             {
+                //Debug - follow a projectile to make sure following is working.
+                if (mProjectiles.IndexOf(projectile) == 6)
+                    mMap.CenterCell = new Vector2(projectile.GridX, projectile.GridY);
                 projectile.Draw(spriteBatch);
                 
             }
-            foreach(Character character in mCharacters)
+            foreach(IPlayer character in mCharacters)
             {
                 character.Draw(spriteBatch);
-            }
+            } 
+        }
 
-            
+        public void AddCharacters(IPlayer player)
+        {
+            mCharacters.Add(player);
         }
     }
 }