summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tilereg-cmd.cc
diff options
context:
space:
mode:
authorBrendan Hickey <brendan@bhickey.net>2013-07-28 00:31:07 -0700
committerBrendan Hickey <brendan@bhickey.net>2013-07-28 00:37:53 -0700
commitcc0fb03b9eee93cd3fbfb7b9ea40c8b1bfa7a872 (patch)
tree2534d2f5cac007ec674bc966576f0d47542d17b0 /crawl-ref/source/tilereg-cmd.cc
parent772cbec2479d6b59ccb91cad149c7edf8968cf6f (diff)
downloadcrawl-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/tilereg-cmd.cc')
-rw-r--r--crawl-ref/source/tilereg-cmd.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/tilereg-cmd.cc b/crawl-ref/source/tilereg-cmd.cc
index 4143ac29cb..c274492adc 100644
--- a/crawl-ref/source/tilereg-cmd.cc
+++ b/crawl-ref/source/tilereg-cmd.cc
@@ -186,9 +186,9 @@ static bool _command_not_applicable(const command_type cmd, bool safe)
case CMD_INTERLEVEL_TRAVEL:
return (!safe);
case CMD_DISPLAY_RELIGION:
- return (you.religion == GOD_NO_GOD);
+ return (you_worship(GOD_NO_GOD));
case CMD_PRAY:
- return (you.religion == GOD_NO_GOD
+ return (you_worship(GOD_NO_GOD)
&& !feat_is_altar(grd(you.pos())));
case CMD_USE_ABILITY:
return (your_talents(false).empty());