diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-08 04:29:50 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-08 04:29:50 +0000 |
| commit | 835386081ecfabc9e442ce6cc1139fae06564651 (patch) | |
| tree | ec56759ac399d0ea30d268cec8d2b0eb51fbd8f8 /crawl-ref/source/beam.cc | |
| parent | f9b3fccde9594e3ba99a93a8652416f32e662f8d (diff) | |
| download | crawl-ref-835386081ecfabc9e442ce6cc1139fae06564651.tar.gz crawl-ref-835386081ecfabc9e442ce6cc1139fae06564651.zip | |
Clean up handling of angered monsters.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5579 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
| -rw-r--r-- | crawl-ref/source/beam.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 870fc2bc59..4be9722605 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -2603,7 +2603,7 @@ int mons_ench_f2(monsters *monster, bolt &pbolt) return (MON_AFFECTED); } case BEAM_CHARM: /* 9 = charm */ - if (player_angers_monster(monster, false)) + if (player_will_anger_monster(monster)) { simple_monster_message(monster, " is repulsed!"); return (MON_OTHER); @@ -4805,7 +4805,7 @@ static int _affect_monster_enchantment(bolt &beam, monsters *mon) return mons_immune_magic(mon) ? MON_UNAFFECTED : MON_RESIST; beam.obvious_effect = true; - if (player_angers_monster(mon, false)) + if (player_will_anger_monster(mon)) { simple_monster_message(mon, " is repulsed!"); return (MON_OTHER); @@ -4837,7 +4837,7 @@ static int _affect_monster_enchantment(bolt &beam, monsters *mon) return (MON_UNAFFECTED); beam.obvious_effect = true; - if (player_angers_monster(mon, false)) + if (player_will_anger_monster(mon)) { simple_monster_message(mon, " is repulsed!"); return (MON_OTHER); |