X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fcarfire;a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FMelee.cs;h=03f5a65bcf27be1879abf276cc1454ad75f9bef2;hp=b597cb37a856cff74290d2f89c269f48a8831f98;hb=236bc590ff21370c1139a8c01ff35f7b30af743d;hpb=3c616e65a6ecf3ebe7b494c9e22c96bc53a1a36f

diff --git a/CarFire/CarFire/CarFire/Melee.cs b/CarFire/CarFire/CarFire/Melee.cs
index b597cb3..03f5a65 100644
--- a/CarFire/CarFire/CarFire/Melee.cs
+++ b/CarFire/CarFire/CarFire/Melee.cs
@@ -18,6 +18,7 @@ namespace CarFire
         int coolDown;
         Texture2D charModel;
         Texture2D projectileModel;
+        bool isAttacking;
         int velocityX;
         int velocityY;
         #endregion 
@@ -41,6 +42,7 @@ namespace CarFire
 
             /*Zac
              */
+            
             animateMelee = new AnimateMelee(contentManager, this); 
 
         }
@@ -54,19 +56,24 @@ namespace CarFire
             Point aPosition = Game.State.Map.GetPointFromCoordinates(Motion.Position);
             Vector2 drawPosition = new Vector2(aPosition.X, aPosition.Y);
             //spriteBatch.Draw(charModel, position, Color.White);
+            if (isAttacking)
             animateMelee.AttackLeft(spriteBatch, drawPosition);
             
         }
-
+        public override void UpdateFrame(TimeSpan timeSpan)
+        {
+            animateMelee.Update(timeSpan);
+        }
         public override void Attack(List<Keys> keysPressed)
         {
             if (coolDown > 0)
                 coolDown--;
             else if (coolDown == 0)
             {
-                
+                isAttacking = false;
                 if (keysPressed.Contains<Keys>(Keys.Space))
                 {
+                    isAttacking = true;
                     coolDown = hitCoolDown;
                     int startX = Coordinates.X;
                     int startY = Coordinates.Y;