diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-20 21:18:13 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-20 21:18:13 +0000 |
| commit | a28741dd2b29142210f64325cb2cb87c806d3409 (patch) | |
| tree | 611f028941af67538525e535cb3c4f30cb058bf4 /crawl-ref/source/abyss.cc | |
| parent | c917efe2ecd38f449619d7b25160c8053b81e108 (diff) | |
| download | crawl-ref-a28741dd2b29142210f64325cb2cb87c806d3409.tar.gz crawl-ref-a28741dd2b29142210f64325cb2cb87c806d3409.zip | |
Fix 2822832: temporary brands not being removed when thrown with LRET_FUMBLED
plus: thrown weapon permabrand being removed when
DUR_WEAPON_BRAND is active
plus: double messaging of "You are now empty-handed."
Fix 2810517: Added a pre-ability requirements check that handles Lugonu's
enter/exit abyss, berserking, recite, breath attacks and
some more. If the requirements aren't met, the check fails
before the success check, thus no turn is wasted.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10360 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/abyss.cc')
| -rw-r--r-- | crawl-ref/source/abyss.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc index 50e8d2a2f4..255f9c0bc0 100644 --- a/crawl-ref/source/abyss.cc +++ b/crawl-ref/source/abyss.cc @@ -904,7 +904,7 @@ static bool _is_level_corrupted() return (!!env.markers.find(MAT_CORRUPTION_NEXUS)); } -static bool _is_level_incorruptible() +bool is_level_incorruptible() { if (_is_level_corrupted()) { @@ -932,7 +932,7 @@ static void _corrupt_choose_colours() bool lugonu_corrupt_level(int power) { - if (_is_level_incorruptible()) + if (is_level_incorruptible()) return (false); mprf(MSGCH_GOD, "Lugonu's Hand of Corruption reaches out!"); |