X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FDisplay.cs;h=fc2489530e8f53caea9de9b88f5f8ff99be9fb78;hb=1368c1af3d7a4a12b0b0577dbe3edbfd254e2d04;hp=d40c7e80c87d928b29394791d8b46c1bcacd5ffe;hpb=6f4eff30ee197a57bbedb2067f94b12ab0d69d48;p=chaz%2Fcarfire

diff --git a/CarFire/CarFire/CarFire/Display.cs b/CarFire/CarFire/CarFire/Display.cs
index d40c7e8..fc24895 100644
--- a/CarFire/CarFire/CarFire/Display.cs
+++ b/CarFire/CarFire/CarFire/Display.cs
@@ -1,5 +1,9 @@
 #undef SINGLE_TEST
 
+// Define INGAME_ZOOM to allow zooming in and out with
+// the PageUp and PageDown keys.
+#define INGAME_ZOOM
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -107,16 +111,20 @@ namespace CarFire
             mMap.CenterCell = new Vector2(mCharacters[0].GridX, mCharacters[0].GridY);
 #endif
             
-            
+            //Handle projectiles - update and check for wall collisions
             for (int i = 0; i < mProjectiles.Count; i++ )
             {
-                mProjectiles[i].Update(timespan);
+                bool removed = false;
                 if (!mMap.IsCellOpen(new Point(mProjectiles[i].GridX, mProjectiles[i].GridY)))
                 {
                
                     mProjectiles.RemoveAt(i);
+                    removed = true;
                     i--;
                 }
+                if(!removed)
+                mProjectiles[i].Update(timespan);
+                
             }
             //Check for collisons
             for (int j = 0; j < mCharacters.Length; j++) 
@@ -134,6 +142,7 @@ namespace CarFire
                     }
                 }
             }
+            //Update input for each player
             for (int i = 0; i < 4; i++)
             {
                 //If player has not selected a player yet let them select one.
@@ -146,6 +155,7 @@ namespace CarFire
                         mCharacters[i].GridY = mMap.GetStartingPositionForPlayer(i + 1).Y;
                     }
                 }
+                //Regular player input updates
                 else
                 {
 
@@ -153,6 +163,21 @@ namespace CarFire
                     mMap.CenterCell = new Vector2(mCharacters[0].GridX, mCharacters[0].GridY);
                 }
             }
+            //Handle wall collisions of projectiles again...
+            for (int i = 0; i < mProjectiles.Count; i++)
+            {
+                if (!mMap.IsCellOpen(new Point(mProjectiles[i].GridX, mProjectiles[i].GridY)))
+                {
+                    mProjectiles.RemoveAt(i);
+                    i--;
+                }          
+
+            }
+
+#if INGAME_ZOOM
+            if (Keyboard.GetState().IsKeyDown(Keys.PageUp)) mMap.Zoom = mMap.Zoom + 0.5f;
+            if (Keyboard.GetState().IsKeyDown(Keys.PageDown)) mMap.Zoom = mMap.Zoom - 0.5f;
+#endif
         }
 
         /// <summary>
@@ -173,13 +198,10 @@ namespace CarFire
                     mCharacters[i].Draw(spriteBatch);
             } 
         }
-        /*
-        public void AddCharacters(IPlayer player)
-        {
-            mCharacters[mCharacters.Length] = player;
-            //mCharacters.Add(player);
-        }
-         */
+        /// <summary>
+        /// Add a projectile to the Display.
+        /// </summary>
+        /// <param name="projectile"></param>
         public void AddProjectiles(Projectile projectile)
         {
             mProjectiles.Add(projectile);