summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-02-11 01:25:36 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-02-11 01:25:36 +0000
commit3a5945e2b78398b85625a89fe7164b7dfa23c5ba (patch)
treedd0b5c41e7bd0c49158d32eeea71687407845883 /crawl-ref/source
parentab0485a9c1fe6dde6bc11d7655ed92fc57a0177b (diff)
downloadcrawl-ref-3a5945e2b78398b85625a89fe7164b7dfa23c5ba.tar.gz
crawl-ref-3a5945e2b78398b85625a89fe7164b7dfa23c5ba.zip
Reorder the message display wne you leave a good god for an evil god.
The Shining One's warning should come before the message indicating that the divine host has turned against you. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3428 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
-rw-r--r--crawl-ref/source/religion.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 1893f02223..2d459beff6 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -3734,15 +3734,6 @@ void god_pitch(god_type which_god)
if (is_evil_god(you.religion))
{
- // When you leave one of the good gods for an evil god, you make
- // all non-hostile holy beings hostile.
- if (you.penance[GOD_ZIN] || you.penance[GOD_SHINING_ONE] ||
- you.penance[GOD_ELYVILON])
- {
- if (holy_beings_attitude_change())
- mpr("The divine host forsakes you.", MSGCH_MONSTER_ENCHANT);
- }
-
// Note: Using worshipped[] we could make this sort of grudge
// permanent instead of based off of penance. -- bwr
if (you.penance[GOD_SHINING_ONE])
@@ -3751,6 +3742,15 @@ void god_pitch(god_type which_god)
god_speaks(GOD_SHINING_ONE,
"\"You will pay for your evil ways, mortal!\"");
}
+
+ // When you leave one of the good gods for an evil god, you make
+ // all non-hostile holy beings hostile.
+ if (you.penance[GOD_ZIN] || you.penance[GOD_SHINING_ONE] ||
+ you.penance[GOD_ELYVILON])
+ {
+ if (holy_beings_attitude_change())
+ mpr("The divine host forsakes you.", MSGCH_MONSTER_ENCHANT);
+ }
}
// note that you.worshipped[] has already been incremented