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

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

diff --git a/CarFire/CarFire/CarFire/AnimateMelee.cs b/CarFire/CarFire/CarFire/AnimateMelee.cs
index e114dbed0dbc30254ac2f636bec3724bab6d28a0..bda8912f9bfe602fb7d6f2e28a28fd8dd75d1a73 100644 (file)
--- a/CarFire/CarFire/CarFire/AnimateMelee.cs
+++ b/CarFire/CarFire/CarFire/AnimateMelee.cs
@@ -18,48 +18,62 @@ namespace CarFire
         private ContentManager contentManager;\r
         //private GraphicsDeviceManager graphics;\r
         //private SpriteBatch spriteBatch;\r
-\r
+        private bool changedGraphic;\r
+        private string lastPh;\r
         private string ph;\r
         private Vector2 position;\r
         private SpriteBatch character;\r
-\r
+        Player Player;\r
+        \r
+        public void Update(TimeSpan timeSpan)\r
+        {\r
+            SpriteTexture.UpdateFrame(timeSpan);\r
+        }\r
         //constructor(s)\r
-        public AnimateMelee(ContentManager content)\r
+        public AnimateMelee(ContentManager content, Player player)\r
         {\r
             SpriteTexture = new AnimatedTexture(Vector2.Zero, 0, 1.0f, 0.5f);\r
             contentManager = content;\r
             ph = fileNames[3];\r
             position = Vector2.Zero;\r
+            Player = player;\r
+            changedGraphic = true;\r
+            \r
         }\r
 \r
         //methods\r
 \r
-        public void AttackLeft(SpriteBatch spriteBatch)\r
+        public void AttackLeft(SpriteBatch spriteBatch, Vector2 drawSpot)\r
         {\r
             ph = fileNames[0];\r
+            if (lastPh == ph)\r
+                changedGraphic = false;\r
+            else\r
+                changedGraphic = true;\r
+            lastPh = ph;\r
             //graphics = graphicsDeviceManager;\r
             //this.spriteBatch = spriteBatch;\r
-            //spriteBatch.\r
-\r
-            character = new SpriteBatch(spriteBatch.GraphicsDevice);\r
-            Animate();\r
+            //character = new SpriteBatch(spriteBatch.GraphicsDevice);\r
+            character = spriteBatch;\r
+            Animate(drawSpot);\r
 \r
 \r
             // SpriteTexture.Load(graphics.GraphicsDevice, contentManager, "fileNames[0]", 8, 12, true, 1);\r
         }\r
 \r
-        public void Animate()\r
+        public void Animate(Vector2 drawSpot)\r
         {\r
             //character = new SpriteBatch(graphics.GraphicsDevice);\r
             // "character" is the name of the sprite asset in the project.\r
             Console.WriteLine(ph);\r
-            SpriteTexture.Load(character.GraphicsDevice, contentManager, ph, 8, 12, true, 1);\r
+            if(changedGraphic)\r
+                SpriteTexture.Load(character.GraphicsDevice, contentManager, ph, 8, 12, true, 1);\r
             //viewport = graphics.GraphicsDevice.Viewport;\r
-            position = new Vector2(0, 0);//viewport.Width / 2, 0);//viewport.Height / 2f);\r
-\r
-            character.Begin();\r
-            SpriteTexture.DrawFrame(character, position);\r
-            character.End();\r
+            position = new Vector2(Player.Coordinates.X*Map.PixelsToUnitSquares, Player.Coordinates.Y*Map.PixelsToUnitSquares);//viewport.Width / 2, 0);//viewport.Height / 2f);\r
+            Console.WriteLine(drawSpot);\r
+            //character.Begin();\r
+            SpriteTexture.DrawFrame(character, drawSpot);\r
+            //character.End();\r
         }\r
 \r
     }\r