diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-03 20:00:42 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-03 20:00:42 +0000 |
| commit | c07f2c46323c57f9d5699293e3e4458d5bbacde5 (patch) | |
| tree | 4afb8218230bd780be1d925a84f4abe8542aef32 /crawl-ref/source/spells1.cc | |
| parent | 774610f0402dc15c10a1a39105e2427484364006 (diff) | |
| download | crawl-ref-c07f2c46323c57f9d5699293e3e4458d5bbacde5.tar.gz crawl-ref-c07f2c46323c57f9d5699293e3e4458d5bbacde5.zip | |
Some cleanup (replacing you.duration[DUR_CONF] with you.confused())
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7108 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells1.cc')
| -rw-r--r-- | crawl-ref/source/spells1.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc index 65a83236b9..4666e8f176 100644 --- a/crawl-ref/source/spells1.cc +++ b/crawl-ref/source/spells1.cc @@ -81,7 +81,7 @@ int blink(int pow, bool high_level_controlled_blink, bool wizard_blink) { mpr("The power of the Abyss keeps you in your place!"); } - else if (you.duration[DUR_CONF] && !wizard_blink) + else if (you.confused() && !wizard_blink) random_blink(false); else if (!allow_control_teleport(true) && !wizard_blink) { @@ -217,7 +217,7 @@ void random_blink(bool allow_partial_control, bool override_abyss) #ifdef USE_SEMI_CONTROLLED_BLINK //jmf: Add back control, but effect is cast_semi_controlled_blink(pow). - else if (player_control_teleport() && !you.duration[DUR_CONF] + else if (player_control_teleport() && !you.confused() && allow_partial_control && allow_control_teleport()) { mpr("You may select the general direction of your translocation."); @@ -871,7 +871,7 @@ bool cast_vitalisation() int type = 0; // Remove negative afflictions. - if (you.disease || you.rotting || you.duration[DUR_CONF] + if (you.disease || you.rotting || you.confused() || you.duration[DUR_PARALYSIS] || you.duration[DUR_POISONING] || you.duration[DUR_PETRIFIED]) { |