diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-09 21:43:14 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-09 21:43:14 +0000 |
| commit | a4649f7bcd32304352b4d52a9c24a8455b41e8bc (patch) | |
| tree | 2653ff094f7279d0f17c76d14528f0c1cbf1c52d /crawl-ref/source/fight.cc | |
| parent | 94e75528f21fb8aa910c06893dfc46ca2785f20f (diff) | |
| download | crawl-ref-a4649f7bcd32304352b4d52a9c24a8455b41e8bc.tar.gz crawl-ref-a4649f7bcd32304352b4d52a9c24a8455b41e8bc.zip | |
Apply recent commits to 0.4, including Matthew's evil zoo fix.
Now how do I change the properties to native again?
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6465 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 38ae378f58..f5821ebb84 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -3697,8 +3697,7 @@ void melee_attack::mons_apply_attack_flavour(const mon_attack_def &attk) case AF_VAMPIRIC: // Only may bite non-vampiric monsters (or player) capable of bleeding. - if (defender->atype() == ACT_PLAYER - && (you.species == SP_VAMPIRE || !victim_can_bleed(-1)) + if (defender->atype() == ACT_PLAYER && !victim_can_bleed(-1) || defender->atype() == ACT_MONSTER && !victim_can_bleed(def->type)) { |