diff options
author | Bardur Arantsson <bardur@scientician.net> | 2012-06-27 20:56:05 +0200 |
---|---|---|
committer | Bardur Arantsson <bardur@scientician.net> | 2012-06-27 20:56:05 +0200 |
commit | 2384dff0de2858e8c97fa7b18634aca0ec4f5a8e (patch) | |
tree | 5706dc414b2f32669277af7098376c4b8786b405 /src/xtra2.c | |
parent | bcbdb77ad85255f788b2fb37a13d100428f883b1 (diff) |
Remove ALLOW_FEAR preprocessor define
Remove duplicate fear-handling code while we're at it
Diffstat (limited to 'src/xtra2.c')
-rw-r--r-- | src/xtra2.c | 55 |
1 files changed, 2 insertions, 53 deletions
diff --git a/src/xtra2.c b/src/xtra2.c index 6594e482..ef753b3a 100644 --- a/src/xtra2.c +++ b/src/xtra2.c @@ -3452,59 +3452,8 @@ bool_ mon_take_hit(int m_idx, int dam, bool_ *fear, cptr note) return (TRUE); } - -#ifdef ALLOW_FEAR - - /* Mega-Hack -- Pain cancels fear */ - if (m_ptr->monfear && (dam > 0)) - { - int tmp = randint(dam); - - /* Cure a little fear */ - if (tmp < m_ptr->monfear) - { - /* Reduce fear */ - m_ptr->monfear -= tmp; - } - - /* Cure all the fear */ - else - { - /* Cure fear */ - m_ptr->monfear = 0; - - /* No more fear */ - (*fear) = FALSE; - } - } - - /* Sometimes a monster gets scared by damage */ - if (!m_ptr->monfear && !(r_ptr->flags3 & (RF3_NO_FEAR))) - { - int percentage; - - /* Percentage of fully healthy */ - percentage = (100L * m_ptr->hp) / m_ptr->maxhp; - - /* - * Run (sometimes) if at 10% or less of max hit points, - * or (usually) when hit for half its current hit points - */ - if (((percentage <= 10) && (rand_int(10) < percentage)) || - ((dam >= m_ptr->hp) && (rand_int(100) < 80))) - { - /* Hack -- note fear */ - (*fear) = TRUE; - - /* XXX XXX XXX Hack -- Add some timed fear */ - m_ptr->monfear = (randint(10) + - (((dam >= m_ptr->hp) && (percentage > 7)) ? - 20 : ((11 - percentage) * 5))); - } - } - -#endif - + /* Apply fear */ + mon_handle_fear(m_ptr, dam, fear); /* Not dead yet */ return (FALSE); |