X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FMelee.cs;h=03f5a65bcf27be1879abf276cc1454ad75f9bef2;hb=2079dadac9b317d61015a9e37eefc9aca761c1ad;hp=cb25ac81514530f916b051bb7125892163575eb2;hpb=e8ee0aa62a7e8b5dffa9e02c00c3e353a9e93b4c;p=chaz%2Fcarfire

diff --git a/CarFire/CarFire/CarFire/Melee.cs b/CarFire/CarFire/CarFire/Melee.cs
index cb25ac8..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,7 +42,8 @@ namespace CarFire
 
             /*Zac
              */
-            animateMelee = new AnimateMelee(contentManager); 
+            
+            animateMelee = new AnimateMelee(contentManager, this); 
 
         }
         /// <summary>
@@ -51,20 +53,27 @@ namespace CarFire
         public override void Draw(SpriteBatch spriteBatch)
         {
             Rectangle position = Game.State.Map.GetRectangleFromCoordinates(Motion.Position);
+            Point aPosition = Game.State.Map.GetPointFromCoordinates(Motion.Position);
+            Vector2 drawPosition = new Vector2(aPosition.X, aPosition.Y);
             //spriteBatch.Draw(charModel, position, Color.White);
-            animateMelee.AttackLeft(spriteBatch);
+            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;