From c5887300c0f938671c78fc4a59f74ea98ac5bd04 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Mon, 6 Apr 2009 18:13:14 +0000 Subject: Fix 2726622: untransforming not prompting for safe-inscribed equipment Also, when transforming voluntarily (i.e. not via Xom or by drawing a card) you get prompted for the loss of safe-inscribed equipment. If you opt out, it costs neither turn nor mana. There's an edge case when you change from one transformation to another one: if that fails for whatever reason you lose the turn (due to untransforming) and the spell fizzles (including mana loss). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9588 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/spl-cast.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 f8d54c1e02..42c040a3c0 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -1773,32 +1773,32 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail) // Transformations. case SPELL_BLADE_HANDS: if (!transform(powc, TRAN_BLADE_HANDS)) - canned_msg(MSG_SPELL_FIZZLES); + return (SPRET_ABORT); break; case SPELL_SPIDER_FORM: if (!transform(powc, TRAN_SPIDER)) - canned_msg(MSG_SPELL_FIZZLES); + return (SPRET_ABORT); break; case SPELL_STATUE_FORM: if (!transform(powc, TRAN_STATUE)) - canned_msg(MSG_SPELL_FIZZLES); + return (SPRET_ABORT); break; case SPELL_ICE_FORM: if (!transform(powc, TRAN_ICE_BEAST)) - canned_msg(MSG_SPELL_FIZZLES); + return (SPRET_ABORT); break; case SPELL_DRAGON_FORM: if (!transform(powc, TRAN_DRAGON)) - canned_msg(MSG_SPELL_FIZZLES); + return (SPRET_ABORT); break; case SPELL_NECROMUTATION: if (!transform(powc, TRAN_LICH)) - canned_msg(MSG_SPELL_FIZZLES); + return (SPRET_ABORT); break; case SPELL_ALTER_SELF: -- cgit v1.2.3-54-g00ecf