summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2009-12-20 14:39:11 +0100
committerAdam Borowski <kilobyte@angband.pl>2009-12-20 14:39:11 +0100
commit249e014a29786798ee83cd33d661f17b8aec176b (patch)
tree3c20f71af89bfe03a8e01c6fed152fffd12bcf1e /crawl-ref
parent948af24915dbdb673b1d45c02b416c2c557c9bd1 (diff)
downloadcrawl-ref-249e014a29786798ee83cd33d661f17b8aec176b.tar.gz
crawl-ref-249e014a29786798ee83cd33d661f17b8aec176b.zip
Fix mummies being unable to use vampiric weapons (in line with the FR
and former behaviour).
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/fight.cc2
-rw-r--r--crawl-ref/source/item_use.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 91397a6fe9..3c349e283c 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -2024,7 +2024,7 @@ bool melee_attack::player_monattk_hit_effects(bool mondied)
// Vampiric *weapon* effects for the killing blow.
else if (mondied && damage_brand == SPWPN_VAMPIRICISM
&& you.equip[EQ_WEAPON] != -1
- && you.is_undead == US_ALIVE)
+ && you.species != SP_VAMPIRE) // vampires get their bonus elsewhere
{
if (defender->holiness() == MH_NATURAL
&& !defender->is_summoned()
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 4bd5082d00..8e70a848f8 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -176,7 +176,7 @@ bool can_wield(item_def *weapon, bool say_reason,
if (you.hunger_state < HS_FULL
&& get_weapon_brand(*weapon) == SPWPN_VAMPIRICISM
- && you.species != SP_VAMPIRE)
+ && you.species != SP_VAMPIRE && you.species != SP_MUMMY)
{
if (say_reason)
{