summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-27 07:44:37 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-27 07:44:37 +0000
commite38d19ed671795b6cb2e177a7f730272ce4f35b0 (patch)
tree954942a07be20fd5c7ad0cd0f0981880aea107b4 /crawl-ref/source/fight.cc
parenta002f27441e428dadaceb5fa28d260140bc1a66c (diff)
downloadcrawl-ref-e38d19ed671795b6cb2e177a7f730272ce4f35b0.tar.gz
crawl-ref-e38d19ed671795b6cb2e177a7f730272ce4f35b0.zip
[1821098] Fixed bat transform not conferring flight. Fixed player_is_levitating and renamed it to player_is_airborne to describe the function better.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2613 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
-rw-r--r--crawl-ref/source/fight.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 6eef4bd4b3..12f4a370b1 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -1814,7 +1814,7 @@ bool melee_attack::apply_damage_brand()
break;
case SPWPN_ELECTROCUTION:
- if (defender->flies())
+ if (defender->airborne())
break;
else if (defender->res_elec() > 0)
break;
@@ -3228,7 +3228,7 @@ void melee_attack::mons_apply_attack_flavour(const mon_attack_def &attk)
defender->res_elec(),
atk->hit_dice + random2( atk->hit_dice / 2 ));
- if (defender->flies())
+ if (defender->airborne())
special_damage = special_damage * 2 / 3;
if (needs_message && special_damage)