diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-15 14:00:55 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-15 14:00:55 +0000 |
commit | e70481a7e1e421d857655c69e678e0674dd3ceea (patch) | |
tree | 92ca6c3f4faffb2f52b40e1b639ad944cf4e4ba6 /crawl-ref/source/beam.cc | |
parent | c0daf0b5b7d7c4a31909946eefb4141b134d0cb7 (diff) | |
download | crawl-ref-e70481a7e1e421d857655c69e678e0674dd3ceea.tar.gz crawl-ref-e70481a7e1e421d857655c69e678e0674dd3ceea.zip |
Add more holiness cleanups.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3648 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
-rw-r--r-- | crawl-ref/source/beam.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index f89ebc2d1c..f93d3d8016 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -3774,8 +3774,8 @@ static int affect_monster(bolt &beam, monsters *mon) if (mons_friendly( mon ) && beam.flavour != BEAM_CHARM) did_god_conduct( DID_ATTACK_FRIEND, 5, true, mon ); - - if (mons_holiness( mon ) == MH_HOLY) + + if (mons_is_holy( mon )) did_god_conduct( DID_ATTACK_HOLY, mon->hit_dice, true, mon ); if (you.religion == GOD_BEOGH && mons_species(mon->type) == MONS_ORC @@ -3940,11 +3940,11 @@ static int affect_monster(bolt &beam, monsters *mon) { remove_sanctuary(true); } - + if (mons_friendly(mon)) conduct.set( DID_ATTACK_FRIEND, 5, !okay, mon ); - if (mons_holiness( mon ) == MH_HOLY) + if (mons_is_holy(mon)) conduct.set( DID_ATTACK_HOLY, mon->hit_dice, !okay, mon ); } |