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

diff --git a/CarFire/CarFire/CarFire/Display.cs b/CarFire/CarFire/CarFire/Display.cs
index aceadfe..01fbbba 100644
--- a/CarFire/CarFire/CarFire/Display.cs
+++ b/CarFire/CarFire/CarFire/Display.cs
@@ -20,10 +20,9 @@ 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];
+        //IPlayer[] mCharacters = new IPlayer[4];
         Texture2D everything;
         Texture2D projectile1;
         Game mGame;
@@ -63,7 +62,7 @@ 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)
+        public void Update(TimeSpan timespan, GameState state, int thisPlayer)
         {
             
             //INPUT - testing input... has to be through network later
@@ -107,16 +106,16 @@ namespace CarFire
                 
             }
             //Check for collisons
-            for (int j = 0; j < mCharacters.Length; j++) 
+            for (int j = 0; j < mGame.State.mCharacters.Length; j++) 
             {
                
-                if(mCharacters[j] != null)
+                if(mGame.State.mCharacters[j] != null)
                 for (int i = 0; i < mProjectiles.Count; i++)
                 {
-                    if (mProjectiles[i].Coordinates.X == mCharacters[j].Coordinates.X && mProjectiles[i].Coordinates.Y == mCharacters[j].Coordinates.Y)
+                    if (mProjectiles[i].Coordinates.X == mGame.State.mCharacters[j].Coordinates.X && mProjectiles[i].Coordinates.Y == mGame.State.mCharacters[j].Coordinates.Y)
                     {
-                        mCharacters[j].causeDamageTo(mProjectiles[i].Damage);
-                        Console.WriteLine(mCharacters[j].Health);
+                        mGame.State.mCharacters[j].causeDamageTo(mProjectiles[i].Damage);
+                        Console.WriteLine(mGame.State.mCharacters[j].Health);
                         mProjectiles.RemoveAt(i);
                         i--;
                     }
@@ -126,24 +125,24 @@ namespace CarFire
             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 (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));
+                        //mCharacters[i] = new Human(mGame, "", everything, projectile1, this, mGame.State.Map.GetStartingPositionForPlayer(i + 1));
                     }
                 }
                 //Regular player input updates
                 else
                 {
 
-                    mCharacters[i].MovePlayer(timespan, mGame.State.GetKeysDown(i));
+                    mGame.State.mCharacters[i].UpdateInput(timespan, mGame.State.GetKeysDown(i));
                    
                 }
             }
-            if (mCharacters[0] != null)
+            if (mGame.State.mCharacters[thisPlayer] != null)
             {
-                mGame.State.Map.CenterCell = mCharacters[0].Position;
+                mGame.State.Map.CenterCell = mGame.State.mCharacters[thisPlayer].Position;
             }
                 //Handle wall collisions of projectiles again...
             for (int i = 0; i < mProjectiles.Count; i++)
@@ -178,9 +177,9 @@ namespace CarFire
             for(int i = 0; i < mGame.State.NumberOfPlayers; i++)//IPlayer character in mCharacters)
             {
 
-                if (mCharacters[i] != null)
+                if (mGame.State.mCharacters[i] != null)
                 {
-                    mCharacters[i].Draw(spriteBatch);
+                    mGame.State.mCharacters[i].Draw(spriteBatch);
                     
                 }
             }