summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spells1.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-09 21:43:14 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-09 21:43:14 +0000
commita4649f7bcd32304352b4d52a9c24a8455b41e8bc (patch)
tree2653ff094f7279d0f17c76d14528f0c1cbf1c52d /crawl-ref/source/spells1.cc
parent94e75528f21fb8aa910c06893dfc46ca2785f20f (diff)
downloadcrawl-ref-a4649f7bcd32304352b4d52a9c24a8455b41e8bc.tar.gz
crawl-ref-a4649f7bcd32304352b4d52a9c24a8455b41e8bc.zip
Apply recent commits to 0.4, including Matthew's evil zoo fix.
Now how do I change the properties to native again? git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6465 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells1.cc')
-rw-r--r--crawl-ref/source/spells1.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc
index 6c8be52d3c..ca2c9294a7 100644
--- a/crawl-ref/source/spells1.cc
+++ b/crawl-ref/source/spells1.cc
@@ -1206,11 +1206,11 @@ void purification(void)
{
mpr("You feel purified!");
- you.duration[DUR_POISONING] = 0;
+ you.disease = 0;
you.rotting = 0;
+ you.duration[DUR_POISONING] = 0;
you.duration[DUR_CONF] = 0;
you.duration[DUR_SLOW] = 0;
- you.disease = 0;
you.duration[DUR_PARALYSIS] = 0; // can't currently happen -- bwr
you.duration[DUR_PETRIFIED] = 0;
}