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

diff --git a/CarFire/CarFire/CarFire/Display.cs b/CarFire/CarFire/CarFire/Display.cs
index 98f91ed..ed848fa 100644
--- a/CarFire/CarFire/CarFire/Display.cs
+++ b/CarFire/CarFire/CarFire/Display.cs
@@ -1,4 +1,10 @@
-using System;
+#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;
 using System.Text;
@@ -14,13 +20,19 @@ namespace CarFire
     /// </summary>
     public class Display
     {
-        List<Projectile> mProjectiles = new List<Projectile>();
-        List<Character> mCharacters = new List<Character>();
-        Map mMap;
-        int currentCenterX = 5;
-        int currentCenterY = 5;
-        public Display()
+        Texture2D everything;
+        Texture2D projectile1;
+        Game mGame;
+        GameLogic mGameLogic;
+        HUD theHUD;
+#if SINGLE_TEST
+        List<Keys> mLastPressedKeys = new List<Keys>();
+#endif
+        public Display(Game game)
         {
+            mGame = game;
+            mGameLogic = new GameLogic(game);
+            theHUD = new HUD(game);
             /*
             mMap = aMap;
             mCharacters = characters;
@@ -33,23 +45,9 @@ namespace CarFire
         /// </summary>
         public void LoadContent(ContentManager contentManager)
         {
-            Texture2D everything = contentManager.Load<Texture2D>("cs");
-            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
+            everything = contentManager.Load<Texture2D>("cs");
+            projectile1 = contentManager.Load<Texture2D>("projectile");
+            theHUD.LoadContent(contentManager);
         }
 
         /// <summary>
@@ -66,27 +64,14 @@ namespace CarFire
         /// checking for collisions, gathering input, and playing audio.
         /// </summary>
         /// <param name="gameTime">Provides a snapshot of timing values.</param>
-        public void Update(TimeSpan timespan)
+        public void Update(TimeSpan timeSpan,int thisPlayer)
         {
-            mMap.CenterCell = new Vector2(currentCenterX, currentCenterY);
-            foreach (Projectile projectile in mProjectiles)
-            {
-                projectile.Update(timespan);
-            }
-            //Check for collisons
-            foreach (Character character in mCharacters)
-            {
-                foreach (Projectile projectile in mProjectiles)
-                {
-                    if (projectile.GridX == character.GridX && projectile.GridY == character.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;
-                    }
-                }
-            }
+            mGameLogic.Update(timeSpan, thisPlayer);
+
+#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>
@@ -95,19 +80,27 @@ namespace CarFire
         /// <param name="spriteBatch">Used to draw with</param>
         public void Draw(SpriteBatch spriteBatch)
         {
-            mMap.Draw(spriteBatch);
-            foreach(Projectile projectile in mProjectiles)
+            mGame.State.Map.Draw(spriteBatch);
+            mGame.State.Entities.ForEach(delegate(IEntity e) { e.Draw(spriteBatch); });
+
+            foreach(Projectile projectile in mGame.State.mProjectiles)
             {
                 projectile.Draw(spriteBatch);
-                
             }
-            foreach(Character character in mCharacters)
+            for(int i = 0; i < mGame.State.NumberOfPlayers; i++)//IPlayer character in mCharacters)
             {
-                character.Draw(spriteBatch);
+
+                if (mGame.State.mCharacters[i] != null)
+                {
+                    mGame.State.mCharacters[i].Draw(spriteBatch);
+                    
+                }
             }
+            theHUD.Draw(spriteBatch);
 
             
         }
+        
     }
 }