From 9894f97f327ff02be121fdf11eabaf54da5e5c35 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Sun, 15 Nov 2009 10:53:00 -0600 Subject: Move the brand_ammo() failure messages to the spellcasting routine. --- crawl-ref/source/spl-cast.cc | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'crawl-ref/source/spl-cast.cc') diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index 728e7c5d9d..91c4e59750 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -1917,35 +1917,43 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail) break; case SPELL_POISON_AMMUNITION: - brand_ammo(SPMSL_POISONED); + if (!brand_ammo(SPMSL_POISONED)) + canned_msg(MSG_SPELL_FIZZLES); break; case SPELL_FLAME_AMMUNITION: - brand_ammo(SPMSL_FLAME); + if (!brand_ammo(SPMSL_FLAME)) + canned_msg(MSG_SPELL_FIZZLES); break; case SPELL_FROST_AMMUNITION: - brand_ammo(SPMSL_FROST); + if (!brand_ammo(SPMSL_FROST)) + canned_msg(MSG_SPELL_FIZZLES); break; case SPELL_WARP_AMMUNITION: - brand_ammo(SPMSL_DISPERSAL); + if (!brand_ammo(SPMSL_DISPERSAL)) + canned_msg(MSG_SPELL_FIZZLES); break; case SPELL_SHOCKING_AMMUNITION: - brand_ammo(SPMSL_ELECTRIC); + if (!brand_ammo(SPMSL_ELECTRIC)) + canned_msg(MSG_SPELL_FIZZLES); break; case SPELL_EXPLODING_AMMUNITION: - brand_ammo(SPMSL_EXPLODING); + if (!brand_ammo(SPMSL_EXPLODING)) + canned_msg(MSG_SPELL_FIZZLES); break; case SPELL_REAPING_AMMUNITION: - brand_ammo(SPMSL_REAPING); + if (!brand_ammo(SPMSL_REAPING)) + canned_msg(MSG_SPELL_FIZZLES); break; case SPELL_RETURNING_AMMUNITION: - brand_ammo(SPMSL_RETURNING); + if (!brand_ammo(SPMSL_RETURNING)) + canned_msg(MSG_SPELL_FIZZLES); break; // Transformations. -- cgit v1.2.3-54-g00ecf