X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fcarfire;a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FPlayer.cs;h=9d6c6b41499dcdd181fc0955de3b459c3b534f3d;hp=0a8d4e54962a6d3485f391978acf2d4ff4bee109;hb=60d05271b295d2ca94a0028059add525c1bbffb1;hpb=6bc3a108ec8f47188a2bf377a23e8a64ec53eccb

diff --git a/CarFire/CarFire/CarFire/Player.cs b/CarFire/CarFire/CarFire/Player.cs
index 0a8d4e5..9d6c6b4 100644
--- a/CarFire/CarFire/CarFire/Player.cs
+++ b/CarFire/CarFire/CarFire/Player.cs
@@ -14,6 +14,7 @@ namespace CarFire
     {
         #region Member variables
         //The number of frames between each projectile is spawned.
+        const float basePlayerSpeed = 4.0f;
         const int shootCoolDown = 18;
         String CharName;
         Game game;
@@ -21,19 +22,27 @@ namespace CarFire
         int playerDamage;
         int score;
         MovementManager mMotion;
+        List<IEntity> mInventory = new List<IEntity>(4);
         int mPlayerIndex;
         #endregion
 
         #region Public Properties
         public int Health { get { return playerHealth; } set{playerHealth = value;} }
-        public int Score { get { return score; } }
+        public int Score { get { return score; } set { score = value; } }
         public bool alive { get { return playerHealth > 0; } }
         public Game Game { get { return game; } }
         public MovementManager Motion { get { return mMotion; } }
         public int PlayerIndex { get { return mPlayerIndex; } }
+        public bool IsCollidable { get { return true; } }
         public Vector2 Position { get { return mMotion.Position; } }
-        public Point Coordinates { get { return mMotion.Coordinates; } }
+        public Point Coordinates { get { return mMotion.Coordinates; } 
+            set
+            {
+                Coordinates = value;
+                mMotion = new MovementManager(value, basePlayerSpeed);
+            } }
         public int Damage { get { return playerDamage; } set { playerDamage = value; } }
+        public List<IEntity> Inventory { get { return mInventory; } }
         #endregion
 
         #region Public Methods