summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2012-06-27 20:57:45 +0200
committerBardur Arantsson <bardur@scientician.net>2012-06-27 20:57:45 +0200
commit047922a4dd4f74c2a475935368bb15edea516e6f (patch)
tree33b2bee5b62ab04bd22e1804c503513efef3b54d
parent2384dff0de2858e8c97fa7b18634aca0ec4f5a8e (diff)
Remove ALLOW_TERROR preprocessor define
-rw-r--r--src/config.h6
-rw-r--r--src/melee2.c9
2 files changed, 0 insertions, 15 deletions
diff --git a/src/config.h b/src/config.h
index 3e0076de..86e4f17f 100644
--- a/src/config.h
+++ b/src/config.h
@@ -119,12 +119,6 @@
/*
- * OPTION: Allow monsters to "flee" from strong players
- */
-#define ALLOW_TERROR
-
-
-/*
* OPTION: Handle signals
*/
#define HANDLE_SIGNALS
diff --git a/src/melee2.c b/src/melee2.c
index 91be521d..04575dd2 100644
--- a/src/melee2.c
+++ b/src/melee2.c
@@ -4680,16 +4680,11 @@ bool_ make_attack_spell(int m_idx)
static int mon_will_run(int m_idx)
{
monster_type *m_ptr = &m_list[m_idx];
-
-#ifdef ALLOW_TERROR
-
u16b p_lev, m_lev;
u16b p_chp, p_mhp;
u16b m_chp, m_mhp;
u32b p_val, m_val;
-#endif
-
/* Keep monsters from running too far away */
if (m_ptr->cdis > MAX_SIGHT + 5) return (FALSE);
@@ -4699,8 +4694,6 @@ static int mon_will_run(int m_idx)
/* All "afraid" monsters will run away */
if (m_ptr->monfear) return (TRUE);
-#ifdef ALLOW_TERROR
-
/* Nearby monsters will not become terrified */
if (m_ptr->cdis <= 5) return (FALSE);
@@ -4729,8 +4722,6 @@ static int mon_will_run(int m_idx)
/* Strong players scare strong monsters */
if (p_val * m_mhp > m_val * p_mhp) return (TRUE);
-#endif
-
/* Assume no terror */
return (FALSE);
}