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

diff --git a/CarFire/CarFire/CarFire/Display.cs b/CarFire/CarFire/CarFire/Display.cs
index 774833b..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;
@@ -21,6 +25,7 @@ namespace CarFire
         //List<IPlayer> mCharacters = new List<IPlayer>();
         IPlayer[] mCharacters = new IPlayer[4];
         Texture2D everything;
+        Texture2D projectile1;
         Map mMap;
         int currentCenterX = 5;
         int currentCenterY = 5;
@@ -42,6 +47,7 @@ namespace CarFire
         public void LoadContent(ContentManager contentManager)
         {
             everything = contentManager.Load<Texture2D>("cs");
+            projectile1 = contentManager.Load<Texture2D>("projectile");
             mMap = contentManager.Load<Map>("Maps/stable");
             Map.DefaultTile = contentManager.Load<Texture2D>("default");
             mMap.CenterCell = new Vector2(currentCenterX,currentCenterY);
@@ -105,32 +111,20 @@ namespace CarFire
             mMap.CenterCell = new Vector2(mCharacters[0].GridX, mCharacters[0].GridY);
 #endif
             
-            for (int i = 0; i < 4; i++)
-            {
-                if (mCharacters[i] == null)
-                {
-                    if(state.keysDown[i].Contains(Keys.Enter))
-                    {
-                        mCharacters[i] = (new Human(mMap, "", everything, everything, this));
-                        mCharacters[i].GridX = mMap.GetStartingPositionForPlayer(i+1).X;
-                        mCharacters[i].GridY = mMap.GetStartingPositionForPlayer(i+1).Y;
-                    }
-                }
-                else
-                {
-                    mMap.CenterCell = new Vector2(mCharacters[0].GridX, mCharacters[0].GridY);
-                    mCharacters[i].MovePlayer(state.keysDown[i]);
-                }
-            }
+            //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++) 
@@ -148,6 +142,42 @@ 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.
+                if (mCharacters[i] == null)
+                {
+                    if (state.keysDown[i].Contains(Keys.Enter))
+                    {
+                        mCharacters[i] = (new Human(mMap, "", everything, projectile1, this));
+                        mCharacters[i].GridX = mMap.GetStartingPositionForPlayer(i + 1).X;
+                        mCharacters[i].GridY = mMap.GetStartingPositionForPlayer(i + 1).Y;
+                    }
+                }
+                //Regular player input updates
+                else
+                {
+
+                    mCharacters[i].MovePlayer(state.keysDown[i]);
+                    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>
@@ -168,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);