X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fcarfire;a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FDisplay.cs;h=aceadfe14dddf4165520be4f47d56a8aab6409e9;hp=ee694fa5a19d7c1f6834393ea499626a30c306c2;hb=af9deb873b24dadd0d509ce199fc6cac2b3efbc9;hpb=28083981691edbfba1d85f0fa6711f70a4e97ed0

diff --git a/CarFire/CarFire/CarFire/Display.cs b/CarFire/CarFire/CarFire/Display.cs
index ee694fa..aceadfe 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;
@@ -22,14 +26,13 @@ namespace CarFire
         IPlayer[] mCharacters = new IPlayer[4];
         Texture2D everything;
         Texture2D projectile1;
-        Map mMap;
-        int currentCenterX = 5;
-        int currentCenterY = 5;
+        Game mGame;
 #if SINGLE_TEST
         List<Keys> mLastPressedKeys = new List<Keys>();
 #endif
-        public Display()
+        public Display(Game game)
         {
+            mGame = game;
             /*
             mMap = aMap;
             mCharacters = characters;
@@ -44,25 +47,6 @@ namespace CarFire
         {
             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);
-            //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>
@@ -111,7 +95,7 @@ namespace CarFire
             for (int i = 0; i < mProjectiles.Count; i++ )
             {
                 bool removed = false;
-                if (!mMap.IsCellOpen(new Point(mProjectiles[i].GridX, mProjectiles[i].GridY)))
+                if (!mGame.State.Map.IsCellOpen(new Point(mProjectiles[i].Coordinates.X, mProjectiles[i].Coordinates.Y)))
                 {
                
                     mProjectiles.RemoveAt(i);
@@ -129,7 +113,7 @@ namespace CarFire
                 if(mCharacters[j] != null)
                 for (int i = 0; i < mProjectiles.Count; i++)
                 {
-                    if (mProjectiles[i].GridX == mCharacters[j].GridX && mProjectiles[i].GridY == mCharacters[j].GridY)
+                    if (mProjectiles[i].Coordinates.X == mCharacters[j].Coordinates.X && mProjectiles[i].Coordinates.Y == mCharacters[j].Coordinates.Y)
                     {
                         mCharacters[j].causeDamageTo(mProjectiles[i].Damage);
                         Console.WriteLine(mCharacters[j].Health);
@@ -138,36 +122,44 @@ namespace CarFire
                     }
                 }
             }
-            for (int i = 0; i < 4; i++)
+            //Update input for each player
+            for (int i = 0; i < mGame.State.NumberOfPlayers; i++)
             {
                 //If player has not selected a player yet let them select one.
                 if (mCharacters[i] == null)
                 {
-                    if (state.keysDown[i].Contains(Keys.Enter))
+                    if (mGame.State.GetKeysDown(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;
+                        mCharacters[i] = new Human(mGame, "", everything, projectile1, this, mGame.State.Map.GetStartingPositionForPlayer(i + 1));
                     }
                 }
+                //Regular player input updates
                 else
                 {
 
-                    mCharacters[i].MovePlayer(state.keysDown[i]);
-                    mMap.CenterCell = new Vector2(mCharacters[0].GridX, mCharacters[0].GridY);
+                    mCharacters[i].MovePlayer(timespan, mGame.State.GetKeysDown(i));
+                   
                 }
             }
-            //Handle wall collisions of projectiles again...
+            if (mCharacters[0] != null)
+            {
+                mGame.State.Map.CenterCell = mCharacters[0].Position;
+            }
+                //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)))
+                if (!mGame.State.Map.IsCellOpen(new Point(mProjectiles[i].Coordinates.X, mProjectiles[i].Coordinates.Y)))
                 {
-
                     mProjectiles.RemoveAt(i);
                     i--;
                 }          
 
             }
+
+#if INGAME_ZOOM
+            if (Keyboard.GetState().IsKeyDown(Keys.PageUp)) mGame.State.Map.Zoom = mGame.State.Map.Zoom + 0.5f;
+            if (Keyboard.GetState().IsKeyDown(Keys.PageDown)) mGame.State.Map.Zoom = mGame.State.Map.Zoom - 0.5f;
+#endif
         }
 
         /// <summary>
@@ -176,25 +168,28 @@ namespace CarFire
         /// <param name="spriteBatch">Used to draw with</param>
         public void Draw(SpriteBatch spriteBatch)
         {
-            mMap.Draw(spriteBatch);
+            mGame.State.Map.Draw(spriteBatch);
+            mGame.State.Entities.ForEach(delegate(IEntity e) { e.Draw(spriteBatch); });
+
             foreach(Projectile projectile in mProjectiles)
             {
                 projectile.Draw(spriteBatch);
-                
             }
-            for(int i = 0; i < 4; i++)//IPlayer character in mCharacters)
+            for(int i = 0; i < mGame.State.NumberOfPlayers; 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);
+                    
+                }
+            }
+            
         }
-         */
+        /// <summary>
+        /// Add a projectile to the Display.
+        /// </summary>
+        /// <param name="projectile"></param>
         public void AddProjectiles(Projectile projectile)
         {
             mProjectiles.Add(projectile);