From 6a295d5f7f78f116f71a89332f48ada4ca3ba045 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Tue, 22 Apr 2008 22:11:34 +0000 Subject: For now use normal tiles for the blessed blades (WPN_FALCHION rather than WPN_BLESSED_FALCHION etc.) FR 1928401: for undead attempting to Evoke an amulet of rage, print "cannot raise a blood rage" message right away instead of printing the "too hungry" message when applicable. FR 1899121: prompt when using stairs that have an exclusion area centered on them. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4492 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/abl-show.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'crawl-ref/source/abl-show.cc') diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index 8b25beec0d..59da0aa72b 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -908,6 +908,13 @@ static bool _activate_talent(const talent& tal) return (false); } + if ((tal.which == ABIL_EVOKE_BERSERK || tal.which == ABIL_TROG_BERSERK) + && !you.can_go_berserk(true)) + { + crawl_state.zero_turns_taken(); + return (false); + } + // some abilities don't need a hunger check bool hungerCheck = true; switch (tal.which) @@ -954,13 +961,6 @@ static bool _activate_talent(const talent& tal) return (false); } - if ((tal.which == ABIL_EVOKE_BERSERK || tal.which == ABIL_TROG_BERSERK) - && !you.can_go_berserk(true)) - { - crawl_state.zero_turns_taken(); - return (false); - } - // don't insta-starve the player // (happens at 100, losing consciousness possible from 500 downward) if (hungerCheck) -- cgit v1.2.3-54-g00ecf