Player doesn't disappear

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

diff --git a/CarFire/CarFire/CarFire/AnimateMelee.cs b/CarFire/CarFire/CarFire/AnimateMelee.cs
index 613c594a4f3a010cbb7dea44fb67b4dcbef0a7c2..3fc08676a6626b153f63f1408c5b64119c146cb2 100644 (file)
--- a/CarFire/CarFire/CarFire/AnimateMelee.cs
+++ b/CarFire/CarFire/CarFire/AnimateMelee.cs
@@ -393,7 +393,7 @@ namespace CarFire
             //SpriteTexture.Load(character.GraphicsDevice, contentManager, ph, 8, 12, true, row);\r
             \r
             if(changedGraphic)\r
             //SpriteTexture.Load(character.GraphicsDevice, contentManager, ph, 8, 12, true, row);\r
             \r
             if(changedGraphic)\r

-                SpriteTexture.Load(character.GraphicsDevice, contentManager, ph, 8, 12, true, 1);\r
+                SpriteTexture.Load(character.GraphicsDevice, contentManager, ph, 8, 12, false, 1);\r

 \r
             //viewport = graphics.GraphicsDevice.Viewport;\r
             position = new Vector2(Player.Coordinates.X*Map.PixelsToUnitSquares, Player.Coordinates.Y*Map.PixelsToUnitSquares);//viewport.Width / 2, 0);//viewport.Height / 2f);\r
 \r
             //viewport = graphics.GraphicsDevice.Viewport;\r
             position = new Vector2(Player.Coordinates.X*Map.PixelsToUnitSquares, Player.Coordinates.Y*Map.PixelsToUnitSquares);//viewport.Width / 2, 0);//viewport.Height / 2f);\r

diff --git a/CarFire/CarFire/CarFire/Melee.cs b/CarFire/CarFire/CarFire/Melee.cs
index 03f5a65bcf27be1879abf276cc1454ad75f9bef2..791999fcba25bf551fc2a0d17ce3c83b91848846 100644 (file)
--- a/CarFire/CarFire/CarFire/Melee.cs
+++ b/CarFire/CarFire/CarFire/Melee.cs
@@ -56,7 +56,7 @@ namespace CarFire
             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
             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

-            if (isAttacking)\r
+            //if (isAttacking)\r

             animateMelee.AttackLeft(spriteBatch, drawPosition);\r
             \r
         }\r
             animateMelee.AttackLeft(spriteBatch, drawPosition);\r
             \r
         }\r