Cleaned up a lot of code which was using info[] to use mprf() directly

instead.
Fixed a bug with affix_weapon_enchantment messaging (mea culpa.)
Fixed shatter() messages getting surpressed.


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

1 files changed, 5 insertions, 8 deletions

diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 95398e679c..305defc058 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -517,16 +517,14 @@ void monster_die(monsters *monster, char killer, int i, bool silent)
             bool created_friendly = 
                         testbits(monster->flags, MF_CREATED_FRIENDLY);
 
-            if (!silent)
+            if (death_message)
             {
                 snprintf(info, INFO_SIZE,
                          "You %s %s!",
                          wounded_damaged(monster->type) ? "destroy" : "kill",
                          ptr_monam(monster, DESC_NOCAP_THE));
-            }
-
-            if (death_message)
                 mpr(info, MSGCH_MONSTER_DAMAGE, MDAM_DEAD);
+            }
 
             if (!created_friendly)
             {
@@ -4766,10 +4764,9 @@ forget_it:
         if (testbits( monster->flags, MF_TAKING_STAIRS ))
         {
 #if DEBUG_DIAGNOSTICS
-            snprintf( info, INFO_SIZE, "%s is skipping movement in order to follow.",
-                      ptr_monam( monster, DESC_CAP_THE ) );
-
-            mpr( info, MSGCH_DIAGNOSTICS );
+            mprf(MSGCH_DIAGNOSTICS,
+                 "%s is skipping movement in order to follow.",
+                 ptr_monam( monster, DESC_CAP_THE ) );
 #endif
             mmov_x = 0;
             mmov_y = 0;