Changed speed of player and projectiles

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

diff --git a/CarFire/CarFire/CarFire/Player.cs b/CarFire/CarFire/CarFire/Player.cs
index 58460500a02932441be7bd4142fd5ba51c8b6f20..b5312550630b1e64a5c4927ee618e174ca26e34e 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
@@ -57,7 +57,7 @@ namespace CarFire
             mPlayerIndex = playerIndex;\r
 \r
             // Speed is the number of grid cells you can move through per second.\r
-            mMotion = new MovementManager(position, 25.0f);\r
+            mMotion = new MovementManager(position, basePlayerSpeed);\r
         }\r
         public void causeDamageTo(int amount)\r
         {\r
@@ -103,7 +103,8 @@ namespace CarFire
                 }\r
             }\r
 \r
-            if (direction != Direction.None && !keysPressed.Contains(Keys.LeftControl)) mMotion.Update(timeSpan, direction);\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

diff --git a/CarFire/CarFire/CarFire/Ranged.cs b/CarFire/CarFire/CarFire/Ranged.cs
index b1203dda96619505ed3e9757d0d8e46bcebe48ff..4121f94129fffc4e568fc850dad6fce21f24de53 100644 (file)
--- a/CarFire/CarFire/CarFire/Ranged.cs
+++ b/CarFire/CarFire/CarFire/Ranged.cs
@@ -20,6 +20,7 @@ namespace CarFire
         Texture2D projectileModel;\r
 \r
         //Used to draw projectiles\r
+        const int baseProjectileSpeed = 18;\r
         int projectileSpeed;\r
         int projectileCoolDown;\r
         #endregion\r
@@ -28,7 +29,7 @@ namespace CarFire
         public Ranged(Game theGame, String Name, Point position, int playerIndex)\r
             : base(theGame, Name, position, playerIndex, baseHealth, baseDamage)\r
         {\r
-            projectileSpeed = 8;\r
+            projectileSpeed = baseProjectileSpeed;\r
         }\r
         #endregion\r
 \r