fixed melee and shooting