diff options
| author | Chris Campbell <chriscampbell89@gmail.com> | 2013-11-08 19:04:13 +0000 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2013-11-11 03:54:06 +0100 |
| commit | 723b4fa0c231dc452cc1ff30a01780d71ac83882 (patch) | |
| tree | bb422b699919251ff2d60ac7fe0a150de183a38d /crawl-ref/source/player-act.cc | |
| parent | d12a4ba87f98e8d1ac6495ea9190b97d9c0129bc (diff) | |
| download | crawl-ref-723b4fa0c231dc452cc1ff30a01780d71ac83882.tar.gz crawl-ref-723b4fa0c231dc452cc1ff30a01780d71ac83882.zip | |
Remove moths of suppression
Suppression is a hugely complicated and inconsistent mechanic. Its
original purpose was to be a way of overriding rPois in Spider but
there are now plenty of monsters that do this effectively (and much more
simply).
[1KB: I moved this to trunk, as it made an already extremely hard to review
branch massively more so. There's nothing but a single enum to preserve,
so compat break doesn't make this removal any easier or harder.]
Diffstat (limited to 'crawl-ref/source/player-act.cc')
| -rw-r--r-- | crawl-ref/source/player-act.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/player-act.cc b/crawl-ref/source/player-act.cc index d755c61ef7..a05f0e1356 100644 --- a/crawl-ref/source/player-act.cc +++ b/crawl-ref/source/player-act.cc @@ -230,7 +230,7 @@ brand_type player::damage_brand(int) if (wpn != -1 && !melded[EQ_WEAPON]) { - if (!is_range_weapon(inv[wpn]) && !suppressed()) + if (!is_range_weapon(inv[wpn])) ret = get_weapon_brand(inv[wpn]); } else if (duration[DUR_CONFUSING_TOUCH]) @@ -670,7 +670,7 @@ bool player::can_go_berserk(bool intentional, bool potion, bool quiet) const return false; } - if (beheld() && !player_equip_unrand_effect(UNRAND_DEMON_AXE)) + if (beheld() && !player_equip_unrand(UNRAND_DEMON_AXE)) { if (verbose) mpr("You are too mesmerised to rage."); |