diff options
| author | Brendan Hickey <brendan@bhickey.net> | 2013-07-28 00:31:07 -0700 |
|---|---|---|
| committer | Brendan Hickey <brendan@bhickey.net> | 2013-07-28 00:37:53 -0700 |
| commit | cc0fb03b9eee93cd3fbfb7b9ea40c8b1bfa7a872 (patch) | |
| tree | 2534d2f5cac007ec674bc966576f0d47542d17b0 /crawl-ref/source/mon-transit.cc | |
| parent | 772cbec2479d6b59ccb91cad149c7edf8968cf6f (diff) | |
| download | crawl-ref-cc0fb03b9eee93cd3fbfb7b9ea40c8b1bfa7a872.tar.gz crawl-ref-cc0fb03b9eee93cd3fbfb7b9ea40c8b1bfa7a872.zip | |
Refactor 'you.religion' checks.
Pull 'you.religion [!=]= FOO' checks into a function: you_worship(FOO).
This change is part of a large plan to clean up religion.
Diffstat (limited to 'crawl-ref/source/mon-transit.cc')
| -rw-r--r-- | crawl-ref/source/mon-transit.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/mon-transit.cc b/crawl-ref/source/mon-transit.cc index 1a87d98a6a..54550a6b0a 100644 --- a/crawl-ref/source/mon-transit.cc +++ b/crawl-ref/source/mon-transit.cc @@ -346,9 +346,9 @@ void follower::restore_mons_items(monster& m) static bool _is_religious_follower(const monster* mon) { - return ((you.religion == GOD_YREDELEMNUL - || you.religion == GOD_BEOGH - || you.religion == GOD_FEDHAS) + return ((you_worship(GOD_YREDELEMNUL) + || you_worship(GOD_BEOGH) + || you_worship(GOD_FEDHAS)) && is_follower(mon)); } |