summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/religion.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-25 17:11:44 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-25 17:11:44 +0000
commitafecd8bc7430a946c2cc47ec9b45cbd0de93499b (patch)
tree37cbec874dba160b5b6ada22eeb5dff8db9b38d0 /crawl-ref/source/religion.cc
parent98fa05c78ca5362eac49bdcc1fd481673089f0d7 (diff)
downloadcrawl-ref-afecd8bc7430a946c2cc47ec9b45cbd0de93499b.tar.gz
crawl-ref-afecd8bc7430a946c2cc47ec9b45cbd0de93499b.zip
Fixed wizmode segfault on &^ with no god.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2575 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
-rw-r--r--crawl-ref/source/religion.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 00aeed4a4b..63ad249a3f 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -686,6 +686,8 @@ static void give_nemelex_gift()
static void do_god_gift(bool prayed_for)
{
+ ASSERT(you.religion != GOD_NO_GOD);
+
// Zin worshippers are the only ones that can pray to ask Zin for stuff.
if (prayed_for != (you.religion == GOD_ZIN))
return;
@@ -1670,7 +1672,7 @@ bool did_god_conduct( conduct_type thing_done, int level, const actor *victim )
void gain_piety(int pgn)
{
// Xom uses piety differently...
- if (you.religion == GOD_XOM)
+ if (you.religion == GOD_XOM || you.religion == GOD_NO_GOD)
return;
// check to see if we owe anything first