change the "Stop eating?" question (trunk only)

Opinions expressed:
> I actually like having "yes" consistently mean take a
> dangerous action, and "no" mean the safe route.

Also:
> I would classify the current behavior--where the "safe" answer
> is the opposite of the one for other prompts--as simply a bug.
[...]

change the dreaded "Stop eating?" prompt to "Continue eating?" with default "no"

diff --git a/doc/fixes35.0 b/doc/fixes35.0
index a5c65fa1c0a3fd80bac81c452ab890f5fed05ce4..e255ec76ce90623595fc73760cc37bb2d8d6f407 100644 (file)
--- a/doc/fixes35.0
+++ b/doc/fixes35.0
@@ -2,6 +2,7 @@ $RCSfile$ $Revision$ $Date$
 
 General Fixes and Modified Features
 -----------------------------------
+change the dreaded "Stop eating?" to "Continue eating?" with default "no"
 setmangry should not be called when a monster enters a bones region
 bad capitalization of msg when charging for something that catches light
 missing opthelp for use_inverse

diff --git a/src/eat.c b/src/eat.c
index 243144344c35b783bfddda11e5da8059a676b0ed..447608782537cd2399714fb043095d50df13e7e0 100644 (file)
--- a/src/eat.c
+++ b/src/eat.c
@@ -2189,7 +2189,8 @@ register int num;
                        context.victual.fullwarn = TRUE;
                        if (context.victual.canchoke && context.victual.reqtime > 1) {
                            /* a one-gulp food will not survive a stop */
-                           if (yn_function("Stop eating?",ynchars,'y')=='y') {
+                           if (yn_function("Continue eating?",
+                                               ynchars,'n') != 'y') {
                                reset_eat();
                                nomovemsg = (char *)0;
                            }