Prevent walking into water or lava by default

Make paranoid_confirmation:swim the default, because it is far more
beginner friendly.

diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn
index 9ffc9f5b022d76e034cb439b99f645ce7a468684..1635643681fa9b877f4054ceacfda6e34ebcc604 100644 (file)
--- a/doc/Guidebook.mn
+++ b/doc/Guidebook.mn
@@ -4103,7 +4103,7 @@ symbols for the various object types.
 Any omitted types are filled in at the end from the previous order.
 .lp paranoid_confirmation
 A space separated list of specific situations where alternate
-prompting is desired.  The default is paranoid_confirmation:pray.
+prompting is desired.  The default is \(lqparanoid_confirmation:pray swim\(rq.
 .PS Were-change
 .PL Confirm
 for any prompts which are set to require \(lqyes\(rq rather than \(oqy\(cq,

diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex
index 3141e602502b5e3da72d0558ea353fa7edb6e8ae..177fb69a57bbcbda89ca97d53a6755a508053fa1 100644 (file)
--- a/doc/Guidebook.tex
+++ b/doc/Guidebook.tex
@@ -4489,7 +4489,7 @@ are filled in at the end from the previous order.
 %.lp
 \item[\ib{paranoid\verb+_+confirmation}]
 A space separated list of specific situations where alternate
-prompting is desired.  The default is ``{\it paranoid\verb+_+confirmation:pray}''.
+prompting is desired.  The default is ``{\it paranoid\verb+_+confirmation:pray swim}''.
 %.sd
 %.si
 \newlength{\pcwidth}

diff --git a/src/options.c b/src/options.c
index 81ad50f493f5c8baafaa2055fc93bdd3b7e09ba6..a5c038784d12cba3c6daaf8a99314f1fcedefde2 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -6085,7 +6085,7 @@ initoptions_init(void)
     flags.end_own = FALSE;
     flags.end_top = 3;
     flags.end_around = 2;
-    flags.paranoia_bits = PARANOID_PRAY; /* old prayconfirm=TRUE */
+    flags.paranoia_bits = PARANOID_PRAY|PARANOID_SWIM;
     flags.pile_limit = PILE_LIMIT_DFLT;  /* 5 */
     flags.runmode = RUN_LEAP;
     iflags.msg_history = 20;