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.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 3cb08259f0..3513f6da5c 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -1133,23 +1133,23 @@ bool bless_follower(monsters* follower,
{
case GOD_SHINING_ONE:
{
- // Make a monster friendly if it's charmed, optionally
- // extending its stay if it's abjurable. If neither is
+ // Extend a monster's stay if it's abjurable, optionally
+ // making it friendly if it's charmed. If neither is
// possible, deliberately fall through.
- bool friendliness = _tso_blessing_friendliness(mon);
- bool more_time = false;
+ bool more_time = _tso_blessing_extend_stay(mon);
+ bool friendliness = false;
- if (!friendliness || coinflip())
- more_time = _tso_blessing_extend_stay(mon);
+ if (!more_time || coinflip())
+ friendliness = _tso_blessing_friendliness(mon);
- if (friendliness && more_time)
+ if (more_time && friendliness)
result = "friendliness and more time in this world";
- else if (friendliness)
- result = "friendliness";
else if (more_time)
result = "more time in this world";
+ else if (friendliness)
+ result = "friendliness";
- if (friendliness || more_time)
+ if (more_time || friendliness)
break;
}