X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fcarfire;a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FDisplay.cs;h=d40c7e80c87d928b29394791d8b46c1bcacd5ffe;hp=774833b67b7bb875422f7b32d58df4b4000f583a;hb=6f4eff30ee197a57bbedb2067f94b12ab0d69d48;hpb=5776c1910247848ab45b111b6a9df4265483a894

diff --git a/CarFire/CarFire/CarFire/Display.cs b/CarFire/CarFire/CarFire/Display.cs
index 774833b..d40c7e8 100644
--- a/CarFire/CarFire/CarFire/Display.cs
+++ b/CarFire/CarFire/CarFire/Display.cs
@@ -21,6 +21,7 @@ namespace CarFire
         //List<IPlayer> mCharacters = new List<IPlayer>();
         IPlayer[] mCharacters = new IPlayer[4];
         Texture2D everything;
+        Texture2D projectile1;
         Map mMap;
         int currentCenterX = 5;
         int currentCenterY = 5;
@@ -42,6 +43,7 @@ namespace CarFire
         public void LoadContent(ContentManager contentManager)
         {
             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);
@@ -105,23 +107,7 @@ namespace CarFire
             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, everything, this));
-                        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);
@@ -148,6 +134,25 @@ namespace CarFire
                     }
                 }
             }
+            for (int i = 0; i < 4; i++)
+            {
+                //If player has not selected a player yet let them select one.
+                if (mCharacters[i] == null)
+                {
+                    if (state.keysDown[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;
+                    }
+                }
+                else
+                {
+
+                    mCharacters[i].MovePlayer(state.keysDown[i]);
+                    mMap.CenterCell = new Vector2(mCharacters[0].GridX, mCharacters[0].GridY);
+                }
+            }
         }
 
         /// <summary>