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

diff --git a/CarFire/CarFire/CarFire/Display.cs b/CarFire/CarFire/CarFire/Display.cs
index 27f151e..ee694fa 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,12 +43,13 @@ 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);
             //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));
@@ -57,7 +59,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
@@ -105,32 +107,20 @@ 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));
-                        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]);
-                }
-            }
+            //Handle projectiles - update and check for wall collisions
             for (int i = 0; i < mProjectiles.Count; i++ )
             {
-                mProjectiles[i].Update(timespan);
+                bool removed = false;
                 if (!mMap.IsCellOpen(new Point(mProjectiles[i].GridX, mProjectiles[i].GridY)))
                 {
                
                     mProjectiles.RemoveAt(i);
+                    removed = true;
                     i--;
                 }
+                if(!removed)
+                mProjectiles[i].Update(timespan);
+                
             }
             //Check for collisons
             for (int j = 0; j < mCharacters.Length; j++) 
@@ -148,6 +138,36 @@ 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);
+                }
+            }
+            //Handle wall collisions of projectiles again...
+            for (int i = 0; i < mProjectiles.Count; i++)
+            {
+                if (!mMap.IsCellOpen(new Point(mProjectiles[i].GridX, mProjectiles[i].GridY)))
+                {
+
+                    mProjectiles.RemoveAt(i);
+                    i--;
+                }          
+
+            }
         }
 
         /// <summary>
@@ -168,12 +188,17 @@ namespace CarFire
                     mCharacters[i].Draw(spriteBatch);
             } 
         }
-
+        /*
         public void AddCharacters(IPlayer player)
         {
             mCharacters[mCharacters.Length] = player;
             //mCharacters.Add(player);
         }
+         */
+        public void AddProjectiles(Projectile projectile)
+        {
+            mProjectiles.Add(projectile);
+        }
     }
 }