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

diff --git a/CarFire/CarFire/CarFire/Melee.cs b/CarFire/CarFire/CarFire/Melee.cs
index f113824..c6fb6e8 100644
--- a/CarFire/CarFire/CarFire/Melee.cs
+++ b/CarFire/CarFire/CarFire/Melee.cs
@@ -22,6 +22,9 @@ namespace CarFire
         int velocityY;
         #endregion 
 
+        //zac variable
+        AnimateMelee animateMelee;
+
         #region Public Methods
         public Melee(Game theGame, String Name, Point position, int playerIndex)
             : base(theGame, Name, position, playerIndex, baseHealth, baseDamage)
@@ -36,6 +39,10 @@ namespace CarFire
             charModel = contentManager.Load<Texture2D>("cs"); //change to charModel when designed
             projectileModel = contentManager.Load<Texture2D>("projectile"); //change to a projectile model later
 
+            /*Zac
+             */
+            animateMelee = new AnimateMelee(contentManager, this); 
+
         }
         /// <summary>
         /// This method will draw a character to the screen.
@@ -44,9 +51,16 @@ namespace CarFire
         public override void Draw(SpriteBatch spriteBatch)
         {
             Rectangle position = Game.State.Map.GetRectangleFromCoordinates(Motion.Position);
-            spriteBatch.Draw(charModel, position, Color.White);
+            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, drawPosition);
+            
+        }
+        public override void UpdateFrame(TimeSpan timeSpan)
+        {
+            animateMelee.Update(timeSpan);
         }
-
         public override void Attack(List<Keys> keysPressed)
         {
             if (coolDown > 0)