summaryrefslogtreecommitdiff
path: root/src/melee1.cc
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2016-09-17 09:58:14 +0200
committerBardur Arantsson <bardur@scientician.net>2016-09-17 09:58:14 +0200
commitc3c9b09d73391ed2d0a0864dc326fc6840da0e2e (patch)
tree5ac0f460840d77c83174a809281533c75158b735 /src/melee1.cc
parent7bf0a5a464c417cbe6d746a0deabd9538d66d4b1 (diff)
Remove inactive player_type::prot{good,undead}
Diffstat (limited to 'src/melee1.cc')
-rw-r--r--src/melee1.cc28
1 files changed, 1 insertions, 27 deletions
diff --git a/src/melee1.cc b/src/melee1.cc
index 09de2cd9..7fdaca55 100644
--- a/src/melee1.cc
+++ b/src/melee1.cc
@@ -292,19 +292,6 @@ bool_ carried_make_attack_normal(int r_idx)
continue;
}
- /* Hack -- Apply "protection from good" */
- if ((p_ptr->protgood > 0) &&
- (r_ptr->flags & RF_GOOD) &&
- (p_ptr->lev >= rlev) &&
- ((rand_int(100) + p_ptr->lev) > 50))
- {
- /* Message */
- msg_format("%s is repelled.", sym_name);
-
- /* Hack -- Next attack */
- continue;
- }
-
/* Assume no cut or stun */
do_cut = do_stun = 0;
@@ -1194,7 +1181,7 @@ bool_ carried_make_attack_normal(int r_idx)
*/
void black_breath_attack(int chance)
{
- if (!p_ptr->protundead && randint(chance) == 1)
+ if (randint(chance) == 1)
{
msg_print("Your foe calls upon your soul!");
msg_print("You feel the Black Breath slowly draining you of life...");
@@ -1439,19 +1426,6 @@ bool_ make_attack_normal(int m_idx, byte divis)
continue;
}
- /* Hack -- Apply "protection from good" */
- if ((p_ptr->protgood > 0) &&
- (r_ptr->flags & RF_GOOD) &&
- (p_ptr->lev >= rlev) &&
- ((rand_int(100) + p_ptr->lev) > 50))
- {
- /* Message */
- msg_format("%^s is repelled.", m_name);
-
- /* Hack -- Next attack */
- continue;
- }
-
/* Assume no cut or stun */
do_cut = do_stun = 0;