Add default answer 'n' to several instances of yesno().

7 files changed, 24 insertions, 12 deletions

diff --git a/crawl-ref/source/it_use3.cc b/crawl-ref/source/it_use3.cc
index 295b5d24e6..81dfb15479 100644
--- a/crawl-ref/source/it_use3.cc
+++ b/crawl-ref/source/it_use3.cc
@@ -487,7 +487,7 @@ void tome_of_power(int slot)
     set_ident_flags(you.inv[slot], ISFLAG_KNOW_TYPE);
     you.turn_is_over = true;
 
-    if (!yesno("Read it?"))
+    if (!yesno("Read it?", false, 'n'))
         return;
 
     if (player_mutation_level(MUT_BLURRY_VISION) > 0
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 11c92d1fbe..38bf295a7a 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -4155,7 +4155,7 @@ static bool _dont_use_invis()
     }
     else if (get_contamination_level() > 0
              && !yesno("Invisibility will do you no good right now; "
-                       "use anyways?"))
+                       "use anyways?", false, 'n'))
     {
         return (true);
     }
@@ -4560,14 +4560,14 @@ bool _drink_fountain()
     potion_type fountain_effect = POT_WATER;
     if (feat == DNGN_FOUNTAIN_BLUE)
     {
-        if (!yesno("Drink from the fountain?"))
+        if (!yesno("Drink from the fountain?", true, 'n'))
             return (false);
 
         mpr("You drink the pure, clear water.");
     }
     else if (feat == DNGN_FOUNTAIN_BLOOD)
     {
-        if (!yesno("Drink from the fountain of blood?"))
+        if (!yesno("Drink from the fountain of blood?", true, 'n'))
             return (false);
 
         mpr("You drink the blood.");
@@ -4575,7 +4575,7 @@ bool _drink_fountain()
     }
     else
     {
-        if (!yesno("Drink from the sparkling fountain?"))
+        if (!yesno("Drink from the sparkling fountain?", true, 'n'))
             return (false);
 
         mpr("You drink the sparkling water.");
diff --git a/crawl-ref/source/overmap.cc b/crawl-ref/source/overmap.cc
index 647008b6a1..6e823ddcd9 100644
--- a/crawl-ref/source/overmap.cc
+++ b/crawl-ref/source/overmap.cc
@@ -831,7 +831,7 @@ void annotate_level()
     {
         if (get_level_annotation(li, true).length() > 0)
         {
-            if (!yesno("Really clear the annotation?"))
+            if (!yesno("Really clear the annotation?", false, 'n'))
                 return;
         }
         else
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index accadce94e..395db6af89 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -4809,7 +4809,7 @@ void offer_items()
             const std::string msg =
                   "Really sacrifice " + item.name(DESC_NOCAP_A) + "?";
 
-            if (!yesno(msg.c_str()))
+            if (!yesno(msg.c_str(), false, 'n'))
             {
                 i = next;
                 continue;
diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc
index 66d9c9d194..6630e0c0db 100644
--- a/crawl-ref/source/spl-book.cc
+++ b/crawl-ref/source/spl-book.cc
@@ -1856,7 +1856,7 @@ bool learn_spell(spell_type specspell, int book, bool is_safest_book)
 #ifdef WIZARD
         if (!you.wizard)
             return (false);
-        else if (!yesno("Memorise anyway?"))
+        else if (!yesno("Memorise anyway?", true, 'n'))
             return (false);
 #else
         return (false);
diff --git a/crawl-ref/source/wiz-item.cc b/crawl-ref/source/wiz-item.cc
index 42376be3ae..b4b94bb94f 100644
--- a/crawl-ref/source/wiz-item.cc
+++ b/crawl-ref/source/wiz-item.cc
@@ -165,7 +165,7 @@ void wizard_create_spec_object()
         if (mons_weight(mon) <= 0)
         {
             if (!yesno("That monster doesn't leave corpses; make one "
-                       "anyway?"))
+                       "anyway?", true, 'y'))
             {
                 return;
             }
@@ -630,7 +630,7 @@ void wizard_make_object_randart()
 
     if (is_random_artefact(item))
     {
-        if (!yesno("Is already a randart; wipe and re-use?"))
+        if (!yesno("Is already a randart; wipe and re-use?", true, 'n'))
         {
             canned_msg(MSG_OK);
             return;
diff --git a/crawl-ref/source/wiz-you.cc b/crawl-ref/source/wiz-you.cc
index cf570e928f..dfc4d32fbb 100644
--- a/crawl-ref/source/wiz-you.cc
+++ b/crawl-ref/source/wiz-you.cc
@@ -454,7 +454,13 @@ bool wizard_add_mutation()
         }
     }
 
-    bool force = yesno("Force mutation to happen?", true, 'n');
+    int answer = yesnoquit("Force mutation to happen?", true, 'n');
+    if (answer == -1)
+    {
+        canned_msg(MSG_OK);
+        return (false);
+    }
+    const bool force = (answer == 1);
 
     if (player_mutation_level(MUT_MUTATION_RESISTANCE) == 3 && !force)
     {
@@ -463,7 +469,13 @@ bool wizard_add_mutation()
         return (false);
     }
 
-    bool god_gift = yesno("Treat mutation as god gift?", true, 'n');
+    answer = yesnoquit("Treat mutation as god gift?", true, 'n');
+    if (answer == -1)
+    {
+        canned_msg(MSG_OK);
+        return (false);
+    }
+    const bool god_gift = (answer == 1);
 
     mpr("Which mutation (name, 'good', 'bad', 'any', 'xom')? ", MSGCH_PROMPT);
     get_input_line( specs, sizeof( specs ) );