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

1 files changed, 4 insertions, 6 deletions

diff --git a/crawl-ref/source/player.h b/crawl-ref/source/player.h
index 1637c6a849..199d2e3066 100644
--- a/crawl-ref/source/player.h
+++ b/crawl-ref/source/player.h
@@ -415,24 +415,22 @@ void set_mp(int new_amount, bool max_too);
 void contaminate_player(int change, bool controlled = false,
                         bool status_only = false);
 
-/* @return true iff they were poisoned (false if they are immune) */
-void curare_hits_player(int agent, int degree);
+bool confuse_player(int amount, bool resistable = true);
+
+bool curare_hits_player(int agent, int degree);
 bool poison_player(int amount, bool force = false);
+void dec_poison_player();
 void reduce_poison_player(int amount);
 
 bool napalm_player(int amount);
 void dec_napalm_player();
 
-bool confuse_player(int amount, bool resistable = true);
-void reduce_confuse_player(int amount);
-
 bool slow_player(int amount);
 void dec_slow_player();
 
 void haste_player(int amount);
 void dec_haste_player();
 
-/* return true iff they were diseased */
 bool disease_player(int amount);
 void dec_disease_player();