summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spells1.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-12 17:27:03 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-12 17:27:03 +0000
commit4fd0078136544a8230f7581e87b57ecd53478414 (patch)
tree5ffcfbbda4fd906a69fefdb40e63fcf5089eb52a /crawl-ref/source/spells1.cc
parentb0636c2afda2df26ab66aeef256a025e19bb68d6 (diff)
downloadcrawl-ref-4fd0078136544a8230f7581e87b57ecd53478414.tar.gz
crawl-ref-4fd0078136544a8230f7581e87b57ecd53478414.zip
Add more player duration cleanups, and fix ouch() napalm death sources.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7439 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells1.cc')
-rw-r--r--crawl-ref/source/spells1.cc10
1 files changed, 4 insertions, 6 deletions
diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc
index b26296c2de..fe99b952c9 100644
--- a/crawl-ref/source/spells1.cc
+++ b/crawl-ref/source/spells1.cc
@@ -1013,14 +1013,12 @@ bool cast_revivification(int pow)
return (success);
}
-void cast_cure_poison(int mabil)
+void cast_cure_poison(int pow)
{
- if (!you.duration[DUR_POISONING])
- canned_msg(MSG_NOTHING_HAPPENS);
+ if (you.duration[DUR_POISONING] > 0)
+ reduce_poison_player(2 + random2(pow) + random2(3));
else
- reduce_poison_player( 2 + random2(mabil) + random2(3) );
-
- return;
+ canned_msg(MSG_NOTHING_HAPPENS);
}
void purification(void)