X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fcarfire;a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FMelee.cs;h=791999fcba25bf551fc2a0d17ce3c83b91848846;hp=c6fb6e82f6aa48ef4094d67628e0ece327d097dc;hb=b58d185e488dbd11198bacb78bb68320c79b1ba5;hpb=692a2af57c7f1586b8513106acf47ddc0ac12748 diff --git a/CarFire/CarFire/CarFire/Melee.cs b/CarFire/CarFire/CarFire/Melee.cs index c6fb6e8..791999f 100644 --- a/CarFire/CarFire/CarFire/Melee.cs +++ b/CarFire/CarFire/CarFire/Melee.cs @@ -18,6 +18,7 @@ namespace CarFire int coolDown; Texture2D charModel; Texture2D projectileModel; + bool isAttacking; int velocityX; int velocityY; #endregion @@ -41,6 +42,7 @@ namespace CarFire /*Zac */ + animateMelee = new AnimateMelee(contentManager, this); } @@ -54,6 +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) animateMelee.AttackLeft(spriteBatch, drawPosition); } @@ -67,9 +70,10 @@ namespace CarFire coolDown--; else if (coolDown == 0) { - + isAttacking = false; if (keysPressed.Contains(Keys.Space)) { + isAttacking = true; coolDown = hitCoolDown; int startX = Coordinates.X; int startY = Coordinates.Y;