]> Dogcows Code - chaz/carfire/blobdiff - CarFire/CarFire/CarFire/Display.cs
Now uses network to update character position
[chaz/carfire] / CarFire / CarFire / CarFire / Display.cs
index c65075f3fb3a2209d6364ab00d69ad7bbc656214..27f151e583d94c41e42f6d1346e0ed8fd4e26c03 100644 (file)
@@ -1,4 +1,6 @@
-using System;\r
+#undef SINGLE_TEST\r
+\r
+using System;\r
 using System.Collections.Generic;\r
 using System.Linq;\r
 using System.Text;\r
@@ -9,11 +11,22 @@ using Microsoft.Xna.Framework.Input;
 \r
 namespace CarFire\r
 {\r
+    /// <summary>\r
+    /// This class is responsible for controlling what draws to the screen when the game is running.\r
+    /// </summary>\r
     public class Display\r
     {\r
+        bool playerChosen = false;\r
         List<Projectile> mProjectiles = new List<Projectile>();\r
-        List<Character> mCharacters = new List<Character>();\r
+        //List<IPlayer> mCharacters = new List<IPlayer>();\r
+        IPlayer[] mCharacters = new IPlayer[4];\r
+        Texture2D everything;\r
         Map mMap;\r
+        int currentCenterX = 5;\r
+        int currentCenterY = 5;\r
+#if SINGLE_TEST\r
+        List<Keys> mLastPressedKeys = new List<Keys>();\r
+#endif\r
         public Display()\r
         {\r
             /*\r
@@ -28,12 +41,25 @@ namespace CarFire
         /// </summary>\r
         public void LoadContent(ContentManager contentManager)\r
         {\r
-            Texture2D everything = contentManager.Load<Texture2D>("cs");\r
+            everything = contentManager.Load<Texture2D>("cs");\r
             mMap = contentManager.Load<Map>("Maps/stable");\r
             Map.DefaultTile = contentManager.Load<Texture2D>("default");\r
-            mMap.CenterCell = new Vector2(5,5);\r
-            //List<object> entities = mMap.GetAllEntities();\r
+            mMap.CenterCell = new Vector2(currentCenterX,currentCenterY);\r
+            //Debugging... Spawn eight projectiles.\r
+            //Diagonals\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
+            mProjectiles.Add(new Projectile(mMap, everything, new Vector2(-5, -5), 10, 10, 300, 300));\r
+            //Vertical and horizontal\r
+            mProjectiles.Add(new Projectile(mMap, everything, new Vector2(0, 5), 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(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
             // TODO: use this.Content to load your game content here\r
         }\r
 \r
@@ -51,24 +77,74 @@ namespace CarFire
         /// checking for collisions, gathering input, and playing audio.\r
         /// </summary>\r
         /// <param name="gameTime">Provides a snapshot of timing values.</param>\r
-        public void Update(TimeSpan timespan)\r
+        public void Update(TimeSpan timespan, GameState state)\r
         {\r
-           \r
-            foreach (Projectile projectile in mProjectiles)\r
+            \r
+            //INPUT - testing input... has to be through network later\r
+#if SINGLE_TEST\r
+            KeyboardState keyState = Keyboard.GetState();\r
+\r
+            List<Keys> pressedKeys = new List<Keys>();\r
+            List<Keys> releasedKeys = new List<Keys>();\r
+\r
+            Keys[] pressedKeysArray = keyState.GetPressedKeys();\r
+            foreach (Keys k in pressedKeysArray)\r
+            {\r
+                if (!mLastPressedKeys.Contains(k)) pressedKeys.Add(k);\r
+                else mLastPressedKeys.Remove(k);\r
+            }\r
+\r
+            releasedKeys = mLastPressedKeys;\r
+            mLastPressedKeys = new List<Keys>(pressedKeysArray);\r
+            //Just apply input for the first player\r
+            mCharacters[0].MovePlayer(pressedKeys);\r
+            if (pressedKeys.Contains(Keys.Enter) && !releasedKeys.Contains(Keys.Enter))\r
+            {\r
+                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));\r
+            }\r
+            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
+            for (int i = 0; i < mProjectiles.Count; i++ )\r
             {\r
-                projectile.Update(timespan);\r
+                mProjectiles[i].Update(timespan);\r
+                if (!mMap.IsCellOpen(new Point(mProjectiles[i].GridX, mProjectiles[i].GridY)))\r
+                {\r
+               \r
+                    mProjectiles.RemoveAt(i);\r
+                    i--;\r
+                }\r
             }\r
             //Check for collisons\r
-            foreach (Character character in mCharacters)\r
+            for (int j = 0; j < mCharacters.Length; j++) \r
             {\r
-                foreach (Projectile projectile in mProjectiles)\r
+               \r
+                if(mCharacters[j] != null)\r
+                for (int i = 0; i < mProjectiles.Count; i++)\r
                 {\r
-                    if (projectile.GridX == character.GridX && projectile.GridY == character.GridY)\r
+                    if (mProjectiles[i].GridX == mCharacters[j].GridX && mProjectiles[i].GridY == mCharacters[j].GridY)\r
                     {\r
-                        //Debug - not sure if you can remove while doing for each\r
-                        //Alternative - while loop, and decrement projectile counter if projectile is removed.\r
-                        mProjectiles.Remove(projectile);\r
-                        character.Health -= projectile.Damage;\r
+                        mCharacters[j].causeDamageTo(mProjectiles[i].Damage);\r
+                        Console.WriteLine(mCharacters[j].Health);\r
+                        mProjectiles.RemoveAt(i);\r
+                        i--;\r
                     }\r
                 }\r
             }\r
@@ -77,7 +153,7 @@ namespace CarFire
         /// <summary>\r
         /// This is called when the game should draw itself.\r
         /// </summary>\r
-        /// <param name="gameTime">Provides a snapshot of timing values.</param>\r
+        /// <param name="spriteBatch">Used to draw with</param>\r
         public void Draw(SpriteBatch spriteBatch)\r
         {\r
             mMap.Draw(spriteBatch);\r
@@ -86,12 +162,17 @@ namespace CarFire
                 projectile.Draw(spriteBatch);\r
                 \r
             }\r
-            foreach(Character character in mCharacters)\r
+            for(int i = 0; i < 4; i++)//IPlayer character in mCharacters)\r
             {\r
-                character.Draw(spriteBatch);\r
-            }\r
+                if(mCharacters[i] != null)\r
+                    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
 }\r
This page took 0.026605 seconds and 4 git commands to generate.