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

diff --git a/CarFire/CarFire/CarFire/Display.cs b/CarFire/CarFire/CarFire/Display.cs
index 5b22c8c..ed848fa 100644
--- a/CarFire/CarFire/CarFire/Display.cs
+++ b/CarFire/CarFire/CarFire/Display.cs
@@ -20,19 +20,19 @@ namespace CarFire
     /// </summary>
     public class Display
     {
-        bool playerChosen = false;
-        List<Projectile> mProjectiles = new List<Projectile>();
-        //List<IPlayer> mCharacters = new List<IPlayer>();
-        //IPlayer[] mCharacters = new IPlayer[4];
         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;
@@ -47,6 +47,7 @@ namespace CarFire
         {
             everything = contentManager.Load<Texture2D>("cs");
             projectile1 = contentManager.Load<Texture2D>("projectile");
+            theHUD.LoadContent(contentManager);
         }
 
         /// <summary>
@@ -63,98 +64,9 @@ 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, GameState state, int thisPlayer)
+        public void Update(TimeSpan timeSpan,int thisPlayer)
         {
-            
-            //INPUT - testing input... has to be through network later
-#if SINGLE_TEST
-            KeyboardState keyState = Keyboard.GetState();
-
-            List<Keys> pressedKeys = new List<Keys>();
-            List<Keys> releasedKeys = new List<Keys>();
-
-            Keys[] pressedKeysArray = keyState.GetPressedKeys();
-            foreach (Keys k in pressedKeysArray)
-            {
-                if (!mLastPressedKeys.Contains(k)) pressedKeys.Add(k);
-                else mLastPressedKeys.Remove(k);
-            }
-
-            releasedKeys = mLastPressedKeys;
-            mLastPressedKeys = new List<Keys>(pressedKeysArray);
-            //Just apply input for the first player
-            mCharacters[0].MovePlayer(pressedKeys);
-            if (pressedKeys.Contains(Keys.Enter) && !releasedKeys.Contains(Keys.Enter))
-            {
-                mProjectiles.Add(new Projectile(mMap, everything, new Vector2(-5,0), mCharacters[0].GridX +1, mCharacters[0].GridY+1, (int)mCharacters[0].GridX*(int)Map.PixelsToUnitSquares,(int)mCharacters[0].GridY*(int)Map.PixelsToUnitSquares));
-            }
-            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++ )
-            {
-                bool removed = false;
-                if (!mGame.State.Map.IsCellOpen(new Point(mProjectiles[i].Coordinates.X, mProjectiles[i].Coordinates.Y)))
-                {
-               
-                    mProjectiles.RemoveAt(i);
-                    removed = true;
-                    i--;
-                }
-                if(!removed)
-                mProjectiles[i].Update(timespan);
-                
-            }
-            //Check for collisons
-            for (int j = 0; j < mGame.State.mCharacters.Length; j++) 
-            {
-               
-                if(mGame.State.mCharacters[j] != null)
-                for (int i = 0; i < mProjectiles.Count; i++)
-                {
-                    if (mProjectiles[i].Coordinates.X == mGame.State.mCharacters[j].Coordinates.X && mProjectiles[i].Coordinates.Y == mGame.State.mCharacters[j].Coordinates.Y)
-                    {
-                        mGame.State.mCharacters[j].causeDamageTo(mProjectiles[i].Damage);
-                        Console.WriteLine(mGame.State.mCharacters[j].Health);
-                        mProjectiles.RemoveAt(i);
-                        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 (mGame.State.mCharacters[i] == null)
-                {
-                    if (mGame.State.GetKeysDown(i).Contains(Keys.Enter))
-                    {
-                        //mCharacters[i] = new Human(mGame, "", everything, projectile1, this, mGame.State.Map.GetStartingPositionForPlayer(i + 1));
-                    }
-                }
-                //Regular player input updates
-                else
-                {
-
-                    mGame.State.mCharacters[i].MovePlayer(timespan, mGame.State.GetKeysDown(i));
-                   
-                }
-            }
-            if (mGame.State.mCharacters[thisPlayer] != null)
-            {
-                mGame.State.Map.CenterCell = mGame.State.mCharacters[thisPlayer].Position;
-            }
-                //Handle wall collisions of projectiles again...
-            for (int i = 0; i < mProjectiles.Count; i++)
-            {
-                if (!mGame.State.Map.IsCellOpen(new Point(mProjectiles[i].Coordinates.X, mProjectiles[i].Coordinates.Y)))
-                {
-                    mProjectiles.RemoveAt(i);
-                    i--;
-                }          
-
-            }
+            mGameLogic.Update(timeSpan, thisPlayer);
 
 #if INGAME_ZOOM
             if (Keyboard.GetState().IsKeyDown(Keys.PageUp)) mGame.State.Map.Zoom = mGame.State.Map.Zoom + 0.5f;
@@ -171,7 +83,7 @@ namespace CarFire
             mGame.State.Map.Draw(spriteBatch);
             mGame.State.Entities.ForEach(delegate(IEntity e) { e.Draw(spriteBatch); });
 
-            foreach(Projectile projectile in mProjectiles)
+            foreach(Projectile projectile in mGame.State.mProjectiles)
             {
                 projectile.Draw(spriteBatch);
             }
@@ -184,16 +96,11 @@ namespace CarFire
                     
                 }
             }
+            theHUD.Draw(spriteBatch);
+
             
         }
-        /// <summary>
-        /// Add a projectile to the Display.
-        /// </summary>
-        /// <param name="projectile"></param>
-        public void AddProjectiles(Projectile projectile)
-        {
-            mProjectiles.Add(projectile);
-        }
+        
     }
 }