git-svn-id: https://bd85.net/svn/cs3505_group@168 92bb83a3-7c8f-8a45-bc97-515c4e399668

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

diff --git a/CarFire/CarFire/CarFire/Player.cs b/CarFire/CarFire/CarFire/Player.cs
index b84b04846158bd63d4f04830a4759c6cd7bc61c2..a827ae250001a9afe4997a29bb36d55c3d6886f7 100644 (file)
--- a/CarFire/CarFire/CarFire/Player.cs
+++ b/CarFire/CarFire/CarFire/Player.cs
@@ -14,7 +14,7 @@ namespace CarFire
     {\r
         #region Member variables\r
         //The number of frames between each projectile is spawned.\r
-        const float basePlayerSpeed = 4.0f;\r
+        const float basePlayerSpeed = 8.0f;\r
         const int shootCoolDown = 18;\r
         String CharName;\r
         Game game;\r
@@ -38,7 +38,7 @@ namespace CarFire
         public Point Coordinates { get { return mMotion.Coordinates; }\r
             set\r
             {\r
-                Coordinates = value;\r
+                mMotion.Coordinates = value;\r
                 mMotion = new MovementManager(value, basePlayerSpeed);\r
             } }\r
         public char Identifier { get { return mPlayerIndex.ToString()[0]; } }\r
@@ -57,16 +57,21 @@ namespace CarFire
             mPlayerIndex = playerIndex;\r
 \r
             // Speed is the number of grid cells you can move through per second.\r
-            mMotion = new MovementManager(position, 4.0f);\r
+            mMotion = new MovementManager(position, basePlayerSpeed);\r
         }\r
         public void causeDamageTo(int amount)\r
         {\r
             playerHealth -= amount;\r
         }\r
-\r
-        public void Update(TimeSpan timeSpan)\r
+        public void Update(TimeSpan timespan)\r
         {\r
 \r
+        }\r
+        public void Update(TimeSpan timeSpan, List<Keys> keysPressed)\r
+        {\r
+            UpdatePosition(timeSpan, keysPressed);\r
+            Attack(keysPressed);\r
+            UpdateFrame(timeSpan);\r
         }\r
         /// <summary>\r
         /// Moves the current player being controlled based on a given set of key presses.\r
@@ -88,22 +93,24 @@ namespace CarFire
             bool moveRight = keysPressed.Contains(Keys.Right);\r
             bool moveUp = keysPressed.Contains(Keys.Up);\r
             bool moveDown = keysPressed.Contains(Keys.Down);\r
-            Point destination = MovementManager.GetNeighborCell(mMotion.Coordinates, moveLeft, moveRight, moveUp, moveDown);\r
-            if (!keysPressed.Contains(Keys.LeftControl))\r
+\r
+            List<Point> possibleDestinations = new List<Point>(3);\r
+            possibleDestinations.Add(MovementManager.GetNeighbor(mMotion.Coordinates, moveLeft, moveRight, moveUp, moveDown));\r
+            possibleDestinations.AddRange(MovementManager.GetNeighbors(mMotion.Coordinates, possibleDestinations[0]));\r
+\r
+            Direction direction = Direction.None;\r
+            foreach (Point destination in possibleDestinations)\r
             {\r
                 if (game.IsCellOpen(destination))\r
                 {\r
-                    mMotion.Update(timeSpan, moveLeft, moveRight, moveUp, moveDown);\r
-                }\r
-                else\r
-                {\r
-                    mMotion.Update(timeSpan);\r
+                    direction = MovementManager.GetDirection(mMotion.Coordinates, destination);\r
+                    break;\r
                 }\r
             }\r
-            else\r
-            {\r
-                mMotion.LockUpdate(timeSpan, moveLeft, moveRight, moveUp, moveDown);\r
-            }\r
+\r
+            if (direction != Direction.None && !keysPressed.Contains(Keys.LeftControl)) \r
+                mMotion.Update(timeSpan, direction);\r
+            else mMotion.LockUpdate(timeSpan, moveLeft, moveRight, moveUp, moveDown);\r
         }\r
         \r
         public void powerUp(int amount)\r
@@ -135,6 +142,7 @@ namespace CarFire
         /// <param name="spriteBatch"></param>\r
         public abstract void Draw(SpriteBatch spriteBatch);\r
         public abstract void Attack(List<Keys> keysPressed);\r
+        public abstract void UpdateFrame(TimeSpan timeSpan);\r
         #endregion\r
 \r
 \r