Fix wands losing a charge even when no shot was actually fired (#4588).
Tidying presentation
Merge pull request #4589 from Menshin/wand_fix

Fix wands losing a charge even when no spell was actually cast