Improved projectiles

[chaz/carfire] / CarFire / CarFire / CarFire / Display.cs

diff --git a/CarFire/CarFire/CarFire/Display.cs b/CarFire/CarFire/CarFire/Display.cs
index 27f151e583d94c41e42f6d1346e0ed8fd4e26c03..d40c7e80c87d928b29394791d8b46c1bcacd5ffe 100644 (file)
--- a/CarFire/CarFire/CarFire/Display.cs
+++ b/CarFire/CarFire/CarFire/Display.cs
@@ -21,6 +21,7 @@ namespace CarFire
         //List<IPlayer> mCharacters = new List<IPlayer>();\r
         IPlayer[] mCharacters = new IPlayer[4];\r
         Texture2D everything;\r
+        Texture2D projectile1;\r
         Map mMap;\r
         int currentCenterX = 5;\r
         int currentCenterY = 5;\r
@@ -42,12 +43,13 @@ namespace CarFire
         public void LoadContent(ContentManager contentManager)\r
         {\r
             everything = contentManager.Load<Texture2D>("cs");\r
+            projectile1 = contentManager.Load<Texture2D>("projectile");\r
             mMap = contentManager.Load<Map>("Maps/stable");\r
             Map.DefaultTile = contentManager.Load<Texture2D>("default");\r
             mMap.CenterCell = new Vector2(currentCenterX,currentCenterY);\r
             //Debugging... Spawn eight projectiles.\r
             //Diagonals\r
-            \r
+            /*\r
             mProjectiles.Add(new Projectile(mMap, everything, new Vector2(5,5), 10, 10, 300, 300));\r
             mProjectiles.Add(new Projectile(mMap, everything, new Vector2(-5, 5), 10, 10, 300, 300));\r
             mProjectiles.Add(new Projectile(mMap, everything, new Vector2(5, -5), 10, 10, 300, 300));\r
@@ -57,7 +59,7 @@ namespace CarFire
             mProjectiles.Add(new Projectile(mMap, everything, new Vector2(-5, 0), 10, 10, 300, 300));\r
             mProjectiles.Add(new Projectile(mMap, everything, new Vector2(5, 0), 10, 10, 300, 300));\r
             mProjectiles.Add(new Projectile(mMap, everything, new Vector2(0, -5), 10, 10, 300, 300));\r
-             \r
+            */\r
 \r
             \r
             // TODO: use this.Content to load your game content here\r
@@ -105,23 +107,7 @@ namespace CarFire
             mMap.CenterCell = new Vector2(mCharacters[0].GridX, mCharacters[0].GridY);\r
 #endif\r
             \r
-            for (int i = 0; i < 4; i++)\r
-            {\r
-                if (mCharacters[i] == null)\r
-                {\r
-                    if(state.keysDown[i].Contains(Keys.Enter))\r
-                    {\r
-                        mCharacters[i] = (new Human(mMap, "", everything));\r
-                        mCharacters[i].GridX = mMap.GetStartingPositionForPlayer(i+1).X;\r
-                        mCharacters[i].GridY = mMap.GetStartingPositionForPlayer(i+1).Y;\r
-                    }\r
-                }\r
-                else\r
-                {\r
-                    mMap.CenterCell = new Vector2(mCharacters[0].GridX, mCharacters[0].GridY);\r
-                    mCharacters[i].MovePlayer(state.keysDown[i]);\r
-                }\r
-            }\r
+            \r
             for (int i = 0; i < mProjectiles.Count; i++ )\r
             {\r
                 mProjectiles[i].Update(timespan);\r
@@ -148,6 +134,25 @@ namespace CarFire
                     }\r
                 }\r
             }\r
+            for (int i = 0; i < 4; i++)\r
+            {\r
+                //If player has not selected a player yet let them select one.\r
+                if (mCharacters[i] == null)\r
+                {\r
+                    if (state.keysDown[i].Contains(Keys.Enter))\r
+                    {\r
+                        mCharacters[i] = (new Human(mMap, "", everything, projectile1, this));\r
+                        mCharacters[i].GridX = mMap.GetStartingPositionForPlayer(i + 1).X;\r
+                        mCharacters[i].GridY = mMap.GetStartingPositionForPlayer(i + 1).Y;\r
+                    }\r
+                }\r
+                else\r
+                {\r
+\r
+                    mCharacters[i].MovePlayer(state.keysDown[i]);\r
+                    mMap.CenterCell = new Vector2(mCharacters[0].GridX, mCharacters[0].GridY);\r
+                }\r
+            }\r
         }\r
 \r
         /// <summary>\r
@@ -168,12 +173,17 @@ namespace CarFire
                     mCharacters[i].Draw(spriteBatch);\r
             } \r
         }\r
-\r
+        /*\r
         public void AddCharacters(IPlayer player)\r
         {\r
             mCharacters[mCharacters.Length] = player;\r
             //mCharacters.Add(player);\r
         }\r
+         */\r
+        public void AddProjectiles(Projectile projectile)\r
+        {\r
+            mProjectiles.Add(projectile);\r
+        }\r
     }\r
 }\r
 \r