diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-05 18:47:11 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-05 18:47:11 -0600 |
| commit | b55ef796dac12067dc52d7adeb4bb60a97051972 (patch) | |
| tree | 6a906949c22161dc53605f8b59b308e3c6c15de4 /crawl-ref/source/monstuff.cc | |
| parent | 1587373bced888a35c938e32bdaf1a3de7e48bae (diff) | |
| download | crawl-ref-b55ef796dac12067dc52d7adeb4bb60a97051972.tar.gz crawl-ref-b55ef796dac12067dc52d7adeb4bb60a97051972.zip | |
Since all unholy monsters are considered evil, remove
mons_is_evil_or_unholy(), and replace it with monsters::is_evil().
Diffstat (limited to 'crawl-ref/source/monstuff.cc')
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 6c65a4a923..737a5bce24 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -1605,7 +1605,7 @@ int monster_die(monsters *monster, killer_type killer, || (!created_friendly && gives_xp && (you.religion == GOD_MAKHLEB || you.religion == GOD_SHINING_ONE - && mons_is_evil_or_unholy(monster)) + && monster->is_evil()) && !player_under_penance() && random2(you.piety) >= piety_breakpoint(0))) { @@ -1621,7 +1621,7 @@ int monster_die(monsters *monster, killer_type killer, && (you.religion == GOD_MAKHLEB || you.religion == GOD_VEHUMET || you.religion == GOD_SHINING_ONE - && mons_is_evil_or_unholy(monster)) + && monster->is_evil()) && !player_under_penance() && random2(you.piety) >= piety_breakpoint(0)) { @@ -1836,7 +1836,7 @@ int monster_die(monsters *monster, killer_type killer, } if (you.religion == GOD_SHINING_ONE - && mons_is_evil_or_unholy(monster) + && monster->is_evil() && !player_under_penance() && random2(you.piety) >= piety_breakpoint(0) && !invalid_monster_index(killer_index)) |