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

diff --git a/CarFire/CarFire/CarFire/Melee.cs b/CarFire/CarFire/CarFire/Melee.cs
index cb25ac8..c6fb6e8 100644
--- a/CarFire/CarFire/CarFire/Melee.cs
+++ b/CarFire/CarFire/CarFire/Melee.cs
@@ -41,7 +41,7 @@ namespace CarFire
 
             /*Zac
              */
-            animateMelee = new AnimateMelee(contentManager); 
+            animateMelee = new AnimateMelee(contentManager, this); 
 
         }
         /// <summary>
@@ -51,11 +51,16 @@ 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);
+            animateMelee.AttackLeft(spriteBatch, drawPosition);
             
         }
-
+        public override void UpdateFrame(TimeSpan timeSpan)
+        {
+            animateMelee.Update(timeSpan);
+        }
         public override void Attack(List<Keys> keysPressed)
         {
             if (coolDown > 0)