diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-04 21:18:28 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-04 21:18:28 +0000 |
| commit | adf10d7dd27e29e7cfd6ce3d7d0a16fb29e6ce5c (patch) | |
| tree | 3bea1eb6e474e58d0aa2ac78334259048bcae904 /crawl-ref/source/beam.cc | |
| parent | a51373bd73dcf4a99fa895ad24508ce5af2d426a (diff) | |
| download | crawl-ref-adf10d7dd27e29e7cfd6ce3d7d0a16fb29e6ce5c.tar.gz crawl-ref-adf10d7dd27e29e7cfd6ce3d7d0a16fb29e6ce5c.zip | |
Fix 2815574: Venom card not waking monsters.
Fix 2815185: Not updating wield display for rotting chunks.
Fix 2812496: Wrong message when attempting to chop with unwieldable
weapons. (Small patch by rafalmaj.)
Fix 2811476: Turn autopickup back on when gaining see invisible
(mutation, ring, artefact, spell).
Fix 2806314: Remove coinflip() for Sandblast range. Wielding rocks now
guarantees range of 2.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10096 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
| -rw-r--r-- | crawl-ref/source/beam.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 4411d80d27..2065139a9d 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -2647,6 +2647,7 @@ bool poison_monster(monsters *monster, kill_category who, int levels, old_pois.degree > 0 ? " looks even sicker." : " is poisoned."); } + behaviour_event(monster, ME_ANNOY, (who == KC_YOU) ? MHITYOU : MHITNOT); } // Finally, take care of deity preferences. @@ -5065,10 +5066,8 @@ int bolt::range_used_on_hit(const actor* victim) const return (used); for (unsigned int i = 0; i < range_funcs.size(); ++i) - { if ( (*range_funcs[i])(*this, victim, used) ) break; - } return (used); } |