git-svn-id: https://bd85.net/svn/cs3505_group@167 92bb83a3-7c8f-8a45-bc97-515c4e399668

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

diff --git a/CarFire/CarFire/CarFire/Melee.cs b/CarFire/CarFire/CarFire/Melee.cs
index cb25ac81514530f916b051bb7125892163575eb2..c6fb6e82f6aa48ef4094d67628e0ece327d097dc 100644 (file)
--- a/CarFire/CarFire/CarFire/Melee.cs
+++ b/CarFire/CarFire/CarFire/Melee.cs
@@ -41,7 +41,7 @@ namespace CarFire
 \r
             /*Zac\r
              */\r
-            animateMelee = new AnimateMelee(contentManager); \r
+            animateMelee = new AnimateMelee(contentManager, this); \r
 \r
         }\r
         /// <summary>\r
@@ -51,11 +51,16 @@ 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
+            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