Add a few more message tweaks.

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

4 files changed, 33 insertions, 32 deletions

diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc
index 5179e4d245..729a062cdd 100644
--- a/crawl-ref/source/spells2.cc
+++ b/crawl-ref/source/spells2.cc
@@ -1268,11 +1268,6 @@ bool cast_summon_scorpions(int pow, bool god_gift)
                           god_gift ? MG_GOD_GIFT : 0)) != -1)
         {
             success = true;
-
-            mpr("A scorpion appears.");
-
-            if (!friendly)
-                mpr("It doesn't look very happy.");
         }
     }
 
@@ -1872,7 +1867,7 @@ bool summon_berserker(int pow, bool god_gift, bool force_hostile)
 }
 
 static bool _summon_holy_being_wrapper(int pow, bool god_gift,
-                                       monster_type mon)
+                                       monster_type mon, bool quiet)
 {
     bool success = false;
 
@@ -1891,9 +1886,12 @@ static bool _summon_holy_being_wrapper(int pow, bool god_gift,
         monsters *summon = &menv[monster];
         summon->flags |= MF_ATT_CHANGE_ATTEMPT;
 
-        mprf("You are momentarily dazzled by a brilliant %s light.",
-             (mon == MONS_DAEVA) ? "golden"
-                                 : "white");
+        if (!quiet)
+        {
+            mprf("You are momentarily dazzled by a brilliant %s light.",
+                 (mon == MONS_DAEVA) ? "golden"
+                                     : "white");
+        }
 
         player_angers_monster(&menv[monster]);
     }
@@ -1902,13 +1900,13 @@ static bool _summon_holy_being_wrapper(int pow, bool god_gift,
 }
 
 // Zin sends an angel for a follower.
-bool summon_guardian(int pow, bool god_gift)
+bool summon_guardian(int pow, bool god_gift, bool quiet)
 {
-    return _summon_holy_being_wrapper(pow, god_gift, MONS_ANGEL);
+    return _summon_holy_being_wrapper(pow, god_gift, MONS_ANGEL, quiet);
 }
 
 // TSO sends a daeva for a follower.
-bool summon_daeva(int pow, bool god_gift)
+bool summon_daeva(int pow, bool god_gift, bool quiet)
 {
-    return _summon_holy_being_wrapper(pow, god_gift, MONS_DAEVA);
+    return _summon_holy_being_wrapper(pow, god_gift, MONS_DAEVA, quiet);
 }
diff --git a/crawl-ref/source/spells2.h b/crawl-ref/source/spells2.h
index 9bee716e1d..6f3b4cdebf 100644
--- a/crawl-ref/source/spells2.h
+++ b/crawl-ref/source/spells2.h
@@ -145,8 +145,8 @@ bool cast_tukimas_dance(int pow, bool god_gift = false,
  * *********************************************************************** */
 bool summon_berserker(int pow, bool god_gift = false,
                       bool force_hostile = false);
-bool summon_guardian(int pow, bool god_gift = false);
-bool summon_daeva(int pow, bool god_gift = false);
+bool summon_guardian(int pow, bool god_gift = false, bool quiet = false);
+bool summon_daeva(int pow, bool god_gift = false, bool quiet = false);
 
 // last updated 24may2000 {dlb}
 /* ***********************************************************************
diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc
index 42ea1897fb..f972ac6956 100644
--- a/crawl-ref/source/spells3.cc
+++ b/crawl-ref/source/spells3.cc
@@ -477,7 +477,8 @@ bool cast_call_imp(int pow, bool god_gift)
 }
 
 static bool _summon_demon_wrapper(int pow, bool god_gift, monster_type mon,
-                                  int dur, bool friendly, bool charmed)
+                                  int dur, bool friendly, bool charmed,
+                                  bool quiet)
 {
     bool success = false;
 
@@ -507,31 +508,33 @@ static bool _summon_demon_wrapper(int pow, bool god_gift, monster_type mon,
 }
 
 static bool _summon_demon_wrapper(int pow, bool god_gift, demon_class_type dct,
-                                  int dur, bool friendly, bool charmed)
+                                  int dur, bool friendly, bool charmed,
+                                  bool quiet)
 {
     monster_type mon = summon_any_demon(dct);
 
-    return _summon_demon_wrapper(pow, god_gift, mon, dur, friendly, charmed);
+    return _summon_demon_wrapper(pow, god_gift, mon, dur, friendly, charmed,
+                                 quiet);
 }
 
-bool summon_lesser_demon(int pow, bool god_gift)
+bool summon_lesser_demon(int pow, bool god_gift, bool quiet)
 {
     return _summon_demon_wrapper(pow, god_gift, DEMON_LESSER,
                                  std::min(2 + (random2(pow) / 4), 6),
-                                 random2(pow) > 3, false);
+                                 random2(pow) > 3, false, quiet);
 }
 
-bool summon_common_demon(int pow, bool god_gift)
+bool summon_common_demon(int pow, bool god_gift, bool quiet)
 {
     return _summon_demon_wrapper(pow, god_gift, DEMON_COMMON,
                                  std::min(2 + (random2(pow) / 4), 6),
-                                 random2(pow) > 3, false);
+                                 random2(pow) > 3, false, quiet);
 }
 
-bool summon_greater_demon(int pow, bool god_gift)
+bool summon_greater_demon(int pow, bool god_gift, bool quiet)
 {
     return _summon_demon_wrapper(pow, god_gift, DEMON_GREATER,
-                                 5, false, random2(pow) > 5);
+                                 5, false, random2(pow) > 5, quiet);
 }
 
 // Makhleb or Kikubaaqudgha sends a demonic buddy (or enemy) for a
@@ -540,7 +543,7 @@ bool summon_demon_type(monster_type mon, int pow, bool god_gift)
 {
     return _summon_demon_wrapper(pow, god_gift, mon,
                                  std::min(2 + (random2(pow) / 4), 6),
-                                 false, random2(pow) > 3);
+                                 false, random2(pow) > 3, false);
 }
 
 bool cast_summon_demon(int pow, bool god_gift)
@@ -565,7 +568,7 @@ bool cast_demonic_horde(int pow, bool god_gift)
 
     for (int i = 0; i < how_many; ++i)
     {
-        if (summon_lesser_demon(pow, god_gift))
+        if (summon_lesser_demon(pow, god_gift, true))
             success = true;
     }
 
@@ -896,7 +899,7 @@ static bool _raise_corpse(int x, int y, int corps, beh_type beha,
 bool animate_a_corpse(int x, int y, corpse_type class_allowed,
                       beh_type beha, unsigned short hitting,
                       bool god_gift, bool actual,
-                      bool silent)
+                      bool quiet)
 {
     bool success = false;
 
@@ -918,7 +921,7 @@ bool animate_a_corpse(int x, int y, corpse_type class_allowed,
 
             if (actual && success)
             {
-                if (!silent)
+                if (!quiet)
                 {
                     if (was_butchering)
                         mpr("The corpse you are butchering rises to attack!");
diff --git a/crawl-ref/source/spells3.h b/crawl-ref/source/spells3.h
index 11593c8db8..9674027ffa 100644
--- a/crawl-ref/source/spells3.h
+++ b/crawl-ref/source/spells3.h
@@ -115,9 +115,9 @@ bool cast_sublimation_of_blood(int pow);
 
 bool summon_shadows(int pow, bool god_gift = false, bool force_hostile = false);
 bool cast_call_imp(int pow, bool god_gift = false);
-bool summon_lesser_demon(int pow, bool god_gift = false);
-bool summon_common_demon(int pow, bool god_gift = false);
-bool summon_greater_demon(int pow, bool god_gift = false);
+bool summon_lesser_demon(int pow, bool god_gift = false, bool quiet = false);
+bool summon_common_demon(int pow, bool god_gift = false, bool quiet = false);
+bool summon_greater_demon(int pow, bool god_gift = false, bool quiet = false);
 bool summon_demon_type(monster_type mon, int pow, bool god_gift = false);
 bool cast_summon_demon(int pow, bool god_gift = false);
 bool cast_demonic_horde(int pow, bool god_gift = false);
@@ -132,7 +132,7 @@ bool cast_summon_horrible_things(int pow, bool god_gift = false);
 bool animate_a_corpse(int x, int y, corpse_type class_allowed,
                       beh_type beha, unsigned short hitting,
                       bool god_gift = false, bool actual = true,
-                      bool silent = false);
+                      bool quiet = false);
 
 // last updated 24may2000 {dlb}
 /* ***********************************************************************