diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-10-31 15:08:00 -0500 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-10-31 15:09:10 -0500 |
| commit | a418d15295dfc484bdeef463ef6678424981b224 (patch) | |
| tree | 0e21c1fa45e4acf5a321582a10510b38d49ebc93 /crawl-ref/source/religion.cc | |
| parent | c96b1349887c237d78ab6f3cbaa3967c1fe31bbe (diff) | |
| download | crawl-ref-a418d15295dfc484bdeef463ef6678424981b224.tar.gz crawl-ref-a418d15295dfc484bdeef463ef6678424981b224.zip | |
Merge mons_holiness() into monster::holiness(), and add an is_unholy()
convenience function.
Diffstat (limited to 'crawl-ref/source/religion.cc')
| -rw-r--r-- | crawl-ref/source/religion.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 6b9d506afa..f19fe4203b 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -1431,7 +1431,7 @@ static bool _is_yred_enslaved_body_and_soul(const monsters* mon) bool is_undead_slave(const monsters* mon) { - return (mon->alive() && mons_holiness(mon) == MH_UNDEAD + return (mon->alive() && mon->holiness() == MH_UNDEAD && mon->attitude == ATT_FRIENDLY); } @@ -6811,7 +6811,7 @@ bool player_can_join_god(god_type which_god) if (you.species == SP_DEMIGOD) return (false); - if (player_is_unholy() && is_good_god(which_god)) + if (you.is_unholy() && is_good_god(which_god)) return (false); // Feawn hates undead, but will accept demonspawn. |