diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-28 18:14:42 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-28 18:14:42 +0000 |
| commit | 95259b9b62799b2e5fe00f8833c28b8a96879e49 (patch) | |
| tree | 0aa0cf24af159eb64efdef6a587ec0997c17d966 /crawl-ref/source/monstuff.cc | |
| parent | 990a102363ff38bf95ed78baf777f2a7ba57e62c (diff) | |
| download | crawl-ref-95259b9b62799b2e5fe00f8833c28b8a96879e49.tar.gz crawl-ref-95259b9b62799b2e5fe00f8833c28b8a96879e49.zip | |
[1836426] Fixed penance message sequence for beams, clamped penance messages at one per turn. (Penance message sequence for melee combat not fixed yet.)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2926 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monstuff.cc')
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 87f3b4c336..a851a5e73d 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -640,32 +640,33 @@ void monster_die(monsters *monster, killer_type killer, int i, bool silent) { if (mons_holiness(monster) == MH_NATURAL) did_god_conduct(DID_KILL_LIVING, - monster->hit_dice); + monster->hit_dice, true, monster); if (mons_holiness(monster) == MH_UNDEAD) did_god_conduct(DID_KILL_UNDEAD, - monster->hit_dice); + monster->hit_dice, true, monster); if (mons_holiness(monster) == MH_DEMONIC) did_god_conduct(DID_KILL_DEMON, - monster->hit_dice); + monster->hit_dice, true, monster); if (mons_class_flag(monster->type, M_EVIL)) did_god_conduct(DID_KILL_NATURAL_EVIL, - monster->hit_dice); + monster->hit_dice, true, monster); // jmf: Trog hates wizards if (mons_is_magic_user(monster)) did_god_conduct(DID_KILL_WIZARD, - monster->hit_dice); + monster->hit_dice, true, monster); // Beogh hates priests of other gods. if (mons_class_flag(monster->type, M_PRIEST)) did_god_conduct(DID_KILL_PRIEST, - monster->hit_dice); + monster->hit_dice, true, monster); if (mons_holiness(monster) == MH_HOLY) - did_god_conduct(DID_KILL_ANGEL, monster->hit_dice); + did_god_conduct(DID_KILL_ANGEL, monster->hit_dice, + true, monster); } // Divine health and mp restoration doesn't happen when killing |