Player doesn't disappear

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

diff --git a/CarFire/CarFire/CarFire/Melee.cs b/CarFire/CarFire/CarFire/Melee.cs
index cb25ac81514530f916b051bb7125892163575eb2..791999fcba25bf551fc2a0d17ce3c83b91848846 100644 (file)
--- a/CarFire/CarFire/CarFire/Melee.cs
+++ b/CarFire/CarFire/CarFire/Melee.cs
@@ -18,6 +18,7 @@ namespace CarFire
         int coolDown;\r
         Texture2D charModel;\r
         Texture2D projectileModel;\r
+        bool isAttacking;\r
         int velocityX;\r
         int velocityY;\r
         #endregion \r
@@ -41,7 +42,8 @@ namespace CarFire
 \r
             /*Zac\r
              */\r
-            animateMelee = new AnimateMelee(contentManager); \r
+            \r
+            animateMelee = new AnimateMelee(contentManager, this); \r
 \r
         }\r
         /// <summary>\r
@@ -51,20 +53,27 @@ namespace CarFire
         public override void Draw(SpriteBatch spriteBatch)\r
         {\r
             Rectangle position = Game.State.Map.GetRectangleFromCoordinates(Motion.Position);\r
+            Point aPosition = Game.State.Map.GetPointFromCoordinates(Motion.Position);\r
+            Vector2 drawPosition = new Vector2(aPosition.X, aPosition.Y);\r
             //spriteBatch.Draw(charModel, position, Color.White);\r
-            animateMelee.AttackLeft(spriteBatch);\r
+            //if (isAttacking)\r
+            animateMelee.AttackLeft(spriteBatch, drawPosition);\r
             \r
         }\r
-\r
+        public override void UpdateFrame(TimeSpan timeSpan)\r
+        {\r
+            animateMelee.Update(timeSpan);\r
+        }\r
         public override void Attack(List<Keys> keysPressed)\r
         {\r
             if (coolDown > 0)\r
                 coolDown--;\r
             else if (coolDown == 0)\r
             {\r
-                \r
+                isAttacking = false;\r
                 if (keysPressed.Contains<Keys>(Keys.Space))\r
                 {\r
+                    isAttacking = true;\r
                     coolDown = hitCoolDown;\r
                     int startX = Coordinates.X;\r
                     int startY = Coordinates.Y;\r