* Fixed Vault:8 level being generated with no rune (cbus).

* Dropped odds of statue vault.
* Take note of messages received in dgamelaunch chat.
* crawl -vscores, etc. should not attempt to create save/morgue directories
  (Marc).
* Changed wording of "Foo wielding bar comes into view" to
  "Foo comes into view. It is wielding bar.".
* Suppress curse status display of monster items.
* TSO worshippers are no longer warned when stabbing monsters if TSO doesn't
  object to stabbing those monsters.
* Wand zap status is now {zapped: N} instead of {zapped N times} to reduce
  verbosity.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2204 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 8 insertions, 7 deletions

diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 673233710f..821120b0eb 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -401,6 +401,8 @@ std::string melee_attack::anon_name(description_level_type desc,
     case DESC_NOCAP_YOUR:
     case DESC_NOCAP_ITS:
         return ("its");
+    case DESC_NONE:
+        return ("");
     case DESC_NOCAP_THE:
     case DESC_NOCAP_A:
     case DESC_PLAIN:
@@ -1193,12 +1195,9 @@ int melee_attack::player_stab(int damage)
         stab_message( def, stab_bonus );
 
         exercise(SK_STABBING, 1 + random2avg(5, 4));
-        
-        if (mons_holiness(def) == MH_NATURAL
-            || mons_holiness(def) == MH_HOLY)
-        {
+
+        if (!tso_stab_safe_monster(defender))
             did_god_conduct(DID_STABBING, 4);
-        }
     }
     else
     {
@@ -2475,10 +2474,12 @@ void melee_attack::player_stab_check()
     if (stab_attempt && roll_needed)
         stab_attempt = (random2(roll) <= you.skills[SK_STABBING] + you.dex);
 
-    if (stab_attempt && you.religion == GOD_SHINING_ONE
+    if (stab_attempt
+        && you.religion == GOD_SHINING_ONE
         && !you.duration[DUR_BERSERKER])
     {
-        if (!yesno("Really attack this helpless creature?", false, 'n'))
+        if (!tso_stab_safe_monster(defender)
+            && !yesno("Really attack this helpless creature?", false, 'n'))
         {
             stab_attempt  = false;
             cancel_attack = true;