From: Kyle <Kyle@92bb83a3-7c8f-8a45-bc97-515c4e399668>
Date: Tue, 27 Apr 2010 20:31:43 +0000 (+0000)
Subject: Player doesn't disappear
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=b58d185e488dbd11198bacb78bb68320c79b1ba5;p=chaz%2Fcarfire

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 613c594..3fc0867 100644
--- 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);
             
             if(changedGraphic)
-                SpriteTexture.Load(character.GraphicsDevice, contentManager, ph, 8, 12, true, 1);
+                SpriteTexture.Load(character.GraphicsDevice, contentManager, ph, 8, 12, false, 1);
 
             //viewport = graphics.GraphicsDevice.Viewport;
             position = new Vector2(Player.Coordinates.X*Map.PixelsToUnitSquares, Player.Coordinates.Y*Map.PixelsToUnitSquares);//viewport.Width / 2, 0);//viewport.Height / 2f);
diff --git a/CarFire/CarFire/CarFire/Melee.cs b/CarFire/CarFire/CarFire/Melee.cs
index 03f5a65..791999f 100644
--- 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);
             Vector2 drawPosition = new Vector2(aPosition.X, aPosition.Y);
             //spriteBatch.Draw(charModel, position, Color.White);
-            if (isAttacking)
+            //if (isAttacking)
             animateMelee.AttackLeft(spriteBatch, drawPosition);
             
         }