X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fcarfire;a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FDisplay.cs;h=27f151e583d94c41e42f6d1346e0ed8fd4e26c03;hp=ed6ab458cabdb91c1e2df54570d533e040846f03;hb=577ff3be4678ec954c84d1b7eb3639ac04c08009;hpb=d0bdd76b2cfd38fe985a7493f42b5d6e0f79ac91

diff --git a/CarFire/CarFire/CarFire/Display.cs b/CarFire/CarFire/CarFire/Display.cs
index ed6ab45..27f151e 100644
--- a/CarFire/CarFire/CarFire/Display.cs
+++ b/CarFire/CarFire/CarFire/Display.cs
@@ -1,4 +1,6 @@
-using System;
+#undef SINGLE_TEST
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -14,11 +16,17 @@ namespace CarFire
     /// </summary>
     public class Display
     {
+        bool playerChosen = false;
         List<Projectile> mProjectiles = new List<Projectile>();
-        List<IPlayer> mCharacters = new List<IPlayer>();
+        //List<IPlayer> mCharacters = new List<IPlayer>();
+        IPlayer[] mCharacters = new IPlayer[4];
+        Texture2D everything;
         Map mMap;
         int currentCenterX = 5;
         int currentCenterY = 5;
+#if SINGLE_TEST
+        List<Keys> mLastPressedKeys = new List<Keys>();
+#endif
         public Display()
         {
             /*
@@ -33,12 +41,13 @@ namespace CarFire
         /// </summary>
         public void LoadContent(ContentManager contentManager)
         {
-            Texture2D everything = contentManager.Load<Texture2D>("cs");
+            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));
@@ -48,6 +57,7 @@ namespace CarFire
             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
@@ -67,9 +77,51 @@ 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, GameState state)
         {
+            
+            //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
+            
+            for (int i = 0; i < 4; i++)
+            {
+                if (mCharacters[i] == null)
+                {
+                    if(state.keysDown[i].Contains(Keys.Enter))
+                    {
+                        mCharacters[i] = (new Human(mMap, "", everything));
+                        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]);
+                }
+            }
             for (int i = 0; i < mProjectiles.Count; i++ )
             {
                 mProjectiles[i].Update(timespan);
@@ -81,16 +133,18 @@ namespace CarFire
                 }
             }
             //Check for collisons
-            for (int j = 0; j < mCharacters.Count; j++) 
+            for (int j = 0; j < mCharacters.Length; j++) 
             {
+               
+                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)
                     {
-                        //Debug - not sure if you can remove while doing for each
-                        //Alternative - while loop, and decrement projectile counter if projectile is removed.
-                        mProjectiles.Remove(mProjectiles[i]);
                         mCharacters[j].causeDamageTo(mProjectiles[i].Damage);
+                        Console.WriteLine(mCharacters[j].Health);
+                        mProjectiles.RemoveAt(i);
+                        i--;
                     }
                 }
             }
@@ -105,21 +159,20 @@ namespace CarFire
             mMap.Draw(spriteBatch);
             foreach(Projectile projectile in mProjectiles)
             {
-                //Debug - follow a projectile to make sure following is working.
-                if (mProjectiles.IndexOf(projectile) == 6)
-                    mMap.CenterCell = new Vector2(projectile.GridX, projectile.GridY);
                 projectile.Draw(spriteBatch);
                 
             }
-            foreach(IPlayer character in mCharacters)
+            for(int i = 0; i < 4; i++)//IPlayer character in mCharacters)
             {
-                character.Draw(spriteBatch);
+                if(mCharacters[i] != null)
+                    mCharacters[i].Draw(spriteBatch);
             } 
         }
 
         public void AddCharacters(IPlayer player)
         {
-            mCharacters.Add(player);
+            mCharacters[mCharacters.Length] = player;
+            //mCharacters.Add(player);
         }
     }
 }