diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-19 16:51:06 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-19 16:51:06 +0000 |
| commit | d51dd4717c3e7842d0647c58de13863e0c9491d6 (patch) | |
| tree | 844f76f34fff39c5fea78f2fe02fa2599b345e6d /crawl-ref/source/spells2.cc | |
| parent | 5045d8f4045963c8f724630d6d0d18d0f394eee3 (diff) | |
| download | crawl-ref-d51dd4717c3e7842d0647c58de13863e0c9491d6.tar.gz crawl-ref-d51dd4717c3e7842d0647c58de13863e0c9491d6.zip | |
Actually apply the patch described in the previous commit. The actual
previous commit was to handle enchantment beams the same way as
offensive beams (oops).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5130 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells2.cc')
| -rw-r--r-- | crawl-ref/source/spells2.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index 3cd7fadc26..6e90afa632 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -1208,21 +1208,21 @@ char burn_freeze(int pow, beam_type flavour) if (flavour != BEAM_MISSILE) hurted = mons_adjust_flavoured(monster, beam, hurted); - if (mons_friendly(monster)) - did_god_conduct(DID_ATTACK_FRIEND, 5, true, monster); - else if (mons_neutral(monster)) - did_god_conduct(DID_ATTACK_NEUTRAL, 5, true, monster); + if (hurted) + { + if (mons_friendly(monster)) + did_god_conduct(DID_ATTACK_FRIEND, 5, true, monster); + else if (mons_neutral(monster)) + did_god_conduct(DID_ATTACK_NEUTRAL, 5, true, monster); - if (is_unchivalric_attack(&you, monster, monster)) - did_god_conduct(DID_UNCHIVALRIC_ATTACK, 5, true, monster); + if (is_unchivalric_attack(&you, monster, monster)) + did_god_conduct(DID_UNCHIVALRIC_ATTACK, 5, true, monster); - if (mons_is_holy(monster)) - did_god_conduct(DID_ATTACK_HOLY, monster->hit_dice); + if (mons_is_holy(monster)) + did_god_conduct(DID_ATTACK_HOLY, monster->hit_dice); - behaviour_event(monster, ME_ANNOY, MHITYOU); + behaviour_event(monster, ME_ANNOY, MHITYOU); - if (hurted) - { hurt_monster(monster, hurted); if (monster->hit_points < 1) |