diff options
| author | Shmuale Mark <shm.mark@gmail.com> | 2014-06-19 08:54:13 -0400 |
|---|---|---|
| committer | Shmuale Mark <shm.mark@gmail.com> | 2014-06-19 12:09:55 -0400 |
| commit | 61e7c1565861f7a89ca6f0554d135d64ec55a6fe (patch) | |
| tree | 5bb02d34013d20e3e95c06b541467729eebf8557 /crawl-ref/source/player.cc | |
| parent | df118164fecb6f63ba9eee7a6a750bee6b4b940f (diff) | |
| download | crawl-ref-61e7c1565861f7a89ca6f0554d135d64ec55a6fe.tar.gz crawl-ref-61e7c1565861f7a89ca6f0554d135d64ec55a6fe.zip | |
Try to reduce duplication in Recite code.
is_chaotic() and is_unclean() have been changed to return an int
roughly equal to what would have been returned before by the Zin
recite function. Some bool flags were added to the function to make
it still work right for the other uses (e.g. silver).
Prince Ribbit is no longer specially vulnerable to Recite, and insane/
sluggish uniques are unclean rather than chaotic, which seems more
consistent with the other uses of the terms.
The special case for nonliving and plant monsters to be unrecitable
is removed.
Diffstat (limited to 'crawl-ref/source/player.cc')
| -rw-r--r-- | crawl-ref/source/player.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 11f479cc91..275bfc18f2 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -6661,9 +6661,9 @@ bool player::is_evil(bool check_spells) const // This is a stub. Check is used only for silver damage. Worship of chaotic // gods should probably be checked in the non-existing player::is_unclean, // which could be used for something Zin-related (such as a priestly monster). -bool player::is_chaotic() const +int player::chaos(bool /*check_spells_god*/) const { - return false; + return 0; } bool player::is_artificial() const |