diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-08 07:52:36 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-08 07:52:36 +0000 |
| commit | cebfd4f93efdfe6cc517f1bda0a59699a8149d3e (patch) | |
| tree | 6793a9eed2d7ba84c0c1577c7b85ac20ad6058b9 /crawl-ref/source/fight.cc | |
| parent | e94375e1a0ecdbfa3032609c29a42eb071d3682a (diff) | |
| download | crawl-ref-cebfd4f93efdfe6cc517f1bda0a59699a8149d3e.tar.gz crawl-ref-cebfd4f93efdfe6cc517f1bda0a59699a8149d3e.zip | |
Apply previous fixes to 0.4.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6450 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 21fcd0613c..c0973cad93 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -3707,7 +3707,7 @@ void melee_attack::mons_apply_attack_flavour(const mon_attack_def &attk) // Disallow draining of summoned monsters since they can't bleed. // XXX: Is this too harsh? - if (mons_is_summoned(def)) + if (defender->atype() == ACT_MONSTER && mons_is_summoned(def)) break; if (x_chance_in_y(defender->res_negative_energy(), 3)) |