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

diff --git a/CarFire/CarFire/CarFire/Display.cs b/CarFire/CarFire/CarFire/Display.cs
index d40c7e8..d8f9a6b 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;
@@ -47,22 +51,6 @@ namespace CarFire
             mMap = contentManager.Load<Map>("Maps/stable");
             Map.DefaultTile = contentManager.Load<Texture2D>("default");
             mMap.CenterCell = new Vector2(currentCenterX,currentCenterY);
-            //Debugging... Spawn eight projectiles.
-            //Diagonals
-            /*
-            mProjectiles.Add(new Projectile(mMap, everything, new Vector2(5,5), 10, 10, 300, 300));
-            mProjectiles.Add(new Projectile(mMap, everything, new Vector2(-5, 5), 10, 10, 300, 300));
-            mProjectiles.Add(new Projectile(mMap, everything, new Vector2(5, -5), 10, 10, 300, 300));
-            mProjectiles.Add(new Projectile(mMap, everything, new Vector2(-5, -5), 10, 10, 300, 300));
-            //Vertical and horizontal
-            mProjectiles.Add(new Projectile(mMap, everything, new Vector2(0, 5), 10, 10, 300, 300));
-            mProjectiles.Add(new Projectile(mMap, everything, new Vector2(-5, 0), 10, 10, 300, 300));
-            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
         }
 
         /// <summary>
@@ -107,16 +95,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 +126,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,13 +139,33 @@ namespace CarFire
                         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);
+                   
                 }
             }
+            if (mCharacters[0] != null)
+            {
+                mMap.CenterCell = new Vector2(mCharacters[0].PixelX / Map.PixelsToUnitSquares, mCharacters[0].PixelY / Map.PixelsToUnitSquares);
+            }
+                //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>
@@ -165,21 +178,31 @@ namespace CarFire
             foreach(Projectile projectile in mProjectiles)
             {
                 projectile.Draw(spriteBatch);
-                
             }
             for(int i = 0; i < 4; i++)//IPlayer character in mCharacters)
             {
-                if(mCharacters[i] != null)
+
+                if (mCharacters[i] != null)
+                {
                     mCharacters[i].Draw(spriteBatch);
-            } 
-        }
-        /*
-        public void AddCharacters(IPlayer player)
-        {
-            mCharacters[mCharacters.Length] = player;
-            //mCharacters.Add(player);
+                    if (Math.Abs(mCharacters[i].GridX - mCharacters[i].PixelX / Map.PixelsToUnitSquares) > 0.7f || 0.7f < Math.Abs(mCharacters[i].GridY - mCharacters[i].PixelY / Map.PixelsToUnitSquares))
+                    {
+                        //Console.WriteLine(Math.Abs(mCharacters[i].GridX - mCharacters[i].PixelX / Map.PixelsToUnitSquares));
+                        //Console.WriteLine(Math.Abs(mCharacters[i].GridY - mCharacters[i].PixelY / Map.PixelsToUnitSquares));
+                        Console.WriteLine("Begin");
+                        Console.WriteLine(mCharacters[i].GridX);
+                        Console.WriteLine(mCharacters[i].GridY);
+                        Console.WriteLine(mCharacters[i].PixelX / Map.PixelsToUnitSquares);
+                        Console.WriteLine(mCharacters[i].PixelY / Map.PixelsToUnitSquares);
+                    }
+                }
+            }
+            
         }
-         */
+        /// <summary>
+        /// Add a projectile to the Display.
+        /// </summary>
+        /// <param name="projectile"></param>
         public void AddProjectiles(Projectile projectile)
         {
             mProjectiles.Add(projectile);