Merge branch 'master' into dwants

Conflicts:
	crawl-ref/docs/crawl_manual.reST
	crawl-ref/source/abl-show.cc
	crawl-ref/source/dat/descript/ability.txt
	crawl-ref/source/delay.cc
	crawl-ref/source/enum.h
	crawl-ref/source/main.cc
	crawl-ref/source/mon-cast.cc
	crawl-ref/source/mon-gear.cc
	crawl-ref/source/mon-spll.h
	crawl-ref/source/mutation-data.h
	crawl-ref/source/mutation.cc
	crawl-ref/source/ng-restr.cc
	crawl-ref/source/ng-setup.cc
	crawl-ref/source/output.cc
	crawl-ref/source/player-act.cc
	crawl-ref/source/player.cc
	crawl-ref/source/species.cc
	crawl-ref/source/spl-data.h
	crawl-ref/source/wiz-you.cc

1 files changed, 10 insertions, 1 deletions

diff --git a/crawl-ref/source/actor.cc b/crawl-ref/source/actor.cc
index 056f35f900..e8aa1ae2cf 100644
--- a/crawl-ref/source/actor.cc
+++ b/crawl-ref/source/actor.cc
@@ -15,6 +15,7 @@
 #include "mon-death.h"
 #include "ouch.h"
 #include "player.h"
+#include "religion.h"
 #include "random.h"
 #include "state.h"
 #include "stuff.h"
@@ -450,7 +451,7 @@ int actor::apply_ac(int damage, int max_damage, ac_type ac_rule,
 bool actor_slime_wall_immune(const actor *act)
 {
     return
-       act->is_player() && you.religion == GOD_JIYVA && !you.penance[GOD_JIYVA]
+       act->is_player() && you_worship(GOD_JIYVA) && !you.penance[GOD_JIYVA]
        || act->res_acid() == 3;
 }
 
@@ -726,7 +727,15 @@ void actor::handle_constriction()
         else if (damage < HIT_STRONG)
             exclams = "!!";
         else
+        {
+            int tmpdamage = damage;
             exclams = "!!!";
+            while (tmpdamage >= 2*HIT_STRONG)
+            {
+                exclams += "!";
+                tmpdamage >>= 1;
+            }
+        }
 
         if (is_player() || you.can_see(this))
         {