summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/religion.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/religion.cc')
-rw-r--r--crawl-ref/source/religion.cc23
1 files changed, 13 insertions, 10 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 28fa6abd9e..35dd4c61f2 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -520,7 +520,7 @@ std::string get_god_likes(god_type which_god, bool verbose)
case GOD_FEAWN:
snprintf(info,INFO_SIZE,"you promote decomposition%s",
- verbose ? " via the <w>f</w> command" : "");
+ verbose ? " via the <w>a</w> command" : "");
likes.push_back(info);
break;
@@ -2678,17 +2678,21 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known,
case DID_NECROMANCY:
case DID_UNHOLY:
- if (you.religion == GOD_FEAWN && known)
+ if (you.religion == GOD_FEAWN)
{
- piety_change = -level;
- penance = level;
- retval = true;
- }
- else
- {
- simple_god_message(" forgives your blasphemy, just this once.");
+ if (known)
+ {
+ piety_change = -level;
+ penance = level;
+ retval = true;
+ }
+ else
+ {
+ simple_god_message(" forgives your blasphemy, just this once.");
+ }
break;
}
+ // else fall-through
case DID_ATTACK_HOLY:
switch (you.religion)
@@ -5217,7 +5221,6 @@ static bool _nemelex_retribution()
return (true);
}
-
static bool _jiyva_retribution()
{
const god_type god = GOD_JIYVA;