diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-20 21:41:27 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-20 21:41:27 +0000 |
| commit | c2aad9d53735d0ac859227b27cd44733a28b31cf (patch) | |
| tree | 0164ae65d718be73c0239ad174053a0c11216543 /crawl-ref/source/player.cc | |
| parent | a28741dd2b29142210f64325cb2cb87c806d3409 (diff) | |
| download | crawl-ref-c2aad9d53735d0ac859227b27cd44733a28b31cf.tar.gz crawl-ref-c2aad9d53735d0ac859227b27cd44733a28b31cf.zip | |
Fix 2824455: Blade Hands not counting as slicing when wearing melded
gloves.
Fix 2824494: Transformation check not taking into account special armour
properties when trying to prevent fatal stat loss.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10361 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
| -rw-r--r-- | crawl-ref/source/player.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index a6b06e0e04..b4d8ab8131 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -6345,18 +6345,11 @@ int player::damage_type(int) const int wpn = equip[ EQ_WEAPON ]; if (wpn != -1) - { return (get_vorpal_type(inv[wpn])); - } - else if (equip[EQ_GLOVES] == -1 - && attribute[ATTR_TRANSFORMATION] == TRAN_BLADE_HANDS) - { + else if (attribute[ATTR_TRANSFORMATION] == TRAN_BLADE_HANDS) return (DVORP_SLICING); - } else if (has_usable_claws()) - { return (DVORP_CLAWING); - } return (DVORP_CRUSHING); } @@ -6368,7 +6361,7 @@ int player::damage_brand(int) if (wpn != -1) { - if ( !is_range_weapon(inv[wpn]) ) + if (!is_range_weapon(inv[wpn])) ret = get_weapon_brand( inv[wpn] ); } else if (duration[DUR_CONFUSING_TOUCH]) |