summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spl-cast.cc
diff options
context:
space:
mode:
authorDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-11-15 10:53:00 -0600
committerDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-11-15 11:01:58 -0600
commit9894f97f327ff02be121fdf11eabaf54da5e5c35 (patch)
tree91a16acca1c5393a3afcae5c2df793634952cbba /crawl-ref/source/spl-cast.cc
parent04d5d1b2d35b9a5ff26635a9142c1a05446b6af8 (diff)
downloadcrawl-ref-9894f97f327ff02be121fdf11eabaf54da5e5c35.tar.gz
crawl-ref-9894f97f327ff02be121fdf11eabaf54da5e5c35.zip
Move the brand_ammo() failure messages to the spellcasting routine.
Diffstat (limited to 'crawl-ref/source/spl-cast.cc')
-rw-r--r--crawl-ref/source/spl-cast.cc24
1 files changed, 16 insertions, 8 deletions
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.