summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2015-08-21 21:06:13 +0200
committerBardur Arantsson <bardur@scientician.net>2015-09-14 05:58:27 +0200
commitbaa22bb096d08b6304b0dada144fec128ac69974 (patch)
treea5a9ed30a022ff4fb35982c3c959ac210749fc9a /src
parenta1d1d2b84a65e6ec518f864b40eb58e413b5497b (diff)
Remove unused IM_MELEE flag
Diffstat (limited to 'src')
-rw-r--r--src/cmd1.cc7
-rw-r--r--src/defines.h1
-rw-r--r--src/init1.cc2
-rw-r--r--src/melee2.cc1
4 files changed, 1 insertions, 10 deletions
diff --git a/src/cmd1.cc b/src/cmd1.cc
index e6494839..02ad1fd8 100644
--- a/src/cmd1.cc
+++ b/src/cmd1.cc
@@ -2232,13 +2232,6 @@ void py_attack(int y, int x, int max_blow)
/* Extract monster name (or "it") */
monster_desc(m_name, m_ptr, 0);
- /* Dont even bother */
- if (r_ptr->flags7 & RF7_IM_MELEE)
- {
- msg_format("%^s is immune to melee attacks.");
- return;
- }
-
/* Auto-Recall if possible and visible */
if (m_ptr->ml) monster_race_track(m_ptr->r_idx, m_ptr->ego);
diff --git a/src/defines.h b/src/defines.h
index 7021609f..8182c1ee 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -3172,7 +3172,6 @@
#define RF7_AI_PLAYER 0x00020000 /* Controlled by the player */
#define RF7_NO_THEFT 0x00040000 /* Monster is immune to theft */
#define RF7_SPIRIT 0x00080000 /* This is a Spirit, coming from the Void */
-#define RF7_IM_MELEE 0x00100000 /* IM melee */
/*
diff --git a/src/init1.cc b/src/init1.cc
index a1d2b7a7..fdf87da2 100644
--- a/src/init1.cc
+++ b/src/init1.cc
@@ -411,7 +411,7 @@ static cptr r_info_flags7[] =
"AI_PLAYER",
"NO_THEFT",
"SPIRIT",
- "IM_MELEE",
+ "XXX7X20",
"XXX7X21",
"XXX7X22",
"XXX7X23",
diff --git a/src/melee2.cc b/src/melee2.cc
index 8e5f09cd..e62b72bb 100644
--- a/src/melee2.cc
+++ b/src/melee2.cc
@@ -5423,7 +5423,6 @@ static bool_ monst_attack_monst(int m_idx, int t_idx)
/* Not allowed to attack */
if (r_ptr->flags1 & RF1_NEVER_BLOW) return FALSE;
- if (tr_ptr->flags7 & RF7_IM_MELEE) return FALSE;
/* Total armor */
ac = t_ptr->ac;