--- nethack-3.4.3/include/hack.h.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/include/hack.h 2003-12-16 19:39:46.000000000 +0100
@@ -192,12 +192,12 @@
#define TEST_TRAV 2 /* test a future travel location */
/*** some utility macros ***/
-#define yn(query) yn_function(query,ynchars, 'n')
-#define ynq(query) yn_function(query,ynqchars, 'q')
-#define ynaq(query) yn_function(query,ynaqchars, 'y')
-#define nyaq(query) yn_function(query,ynaqchars, 'n')
-#define nyNaq(query) yn_function(query,ynNaqchars, 'n')
-#define ynNaq(query) yn_function(query,ynNaqchars, 'y')
+#define nhyn(query) yn_function(query,ynchars, 'n')
+#define nhynq(query) yn_function(query,ynqchars, 'q')
+#define nhynaq(query) yn_function(query,ynaqchars, 'y')
+#define nhnyaq(query) yn_function(query,ynaqchars, 'n')
+#define nhnyNaq(query) yn_function(query,ynNaqchars, 'n')
+#define nhynNaq(query) yn_function(query,ynNaqchars, 'y')
/* Macros for scatter */
#define VIS_EFFECTS 0x01 /* display visual effects */
--- nethack-3.4.3/src/bones.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/src/bones.c 2003-12-16 19:39:46.000000000 +0100
@@ -210,7 +210,7 @@
compress_bonesfile();
#ifdef WIZARD
if (wizard) {
- if (yn("Bones file already exists. Replace it?") == 'y') {
+ if (nhyn("Bones file already exists. Replace it?") == 'y') {
if (delete_bonesfile(&u.uz)) goto make_bones;
else pline("Cannot unlink old bones.");
}
@@ -399,7 +399,7 @@
} else {
#ifdef WIZARD
if(wizard) {
- if(yn("Get bones?") == 'n') {
+ if(nhyn("Get bones?") == 'n') {
(void) close(fd);
compress_bonesfile();
return(0);
@@ -452,7 +452,7 @@
#ifdef WIZARD
if(wizard) {
- if(yn("Unlink bones?") == 'n') {
+ if(nhyn("Unlink bones?") == 'n') {
compress_bonesfile();
return(ok);
}
--- nethack-3.4.3/src/cmd.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/src/cmd.c 2003-12-16 19:39:46.000000000 +0100
@@ -480,7 +480,7 @@
{
if(!discover && !wizard) {
pline("Beware! From explore mode there will be no return to normal game.");
- if (yn("Do you want to enter explore mode?") == 'y') {
+ if (nhyn("Do you want to enter explore mode?") == 'y') {
clear_nhwindow(WIN_MESSAGE);
You("are now in non-scoring explore mode.");
discover = TRUE;
@@ -632,7 +632,7 @@
STATIC_PTR int
wiz_panic()
{
- if (yn("Do you want to call panic() and end your game?") == 'y')
+ if (nhyn("Do you want to call panic() and end your game?") == 'y')
panic("crash test.");
return 0;
}
--- nethack-3.4.3/src/do.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/src/do.c 2003-12-16 19:39:46.000000000 +0100
@@ -810,7 +810,7 @@
if (on_level(&valley_level, &u.uz) && !u.uevent.gehennom_entered) {
You("are standing at the gate to Gehennom.");
pline("Unspeakable cruelty and harm lurk down there.");
- if (yn("Are you sure you want to enter?") != 'y')
+ if (nhyn("Are you sure you want to enter?") != 'y')
return(0);
else pline("So be it.");
u.uevent.gehennom_entered = 1; /* don't ask again */
@@ -868,7 +868,7 @@
return(1);
}
if(ledger_no(&u.uz) == 1) {
- if (yn("Beware, there will be no return! Still climb?") != 'y')
+ if (nhyn("Beware, there will be no return! Still climb?") != 'y')
return(0);
}
if(!next_to_u()) {
--- nethack-3.4.3/src/do_name.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/src/do_name.c 2003-12-16 19:39:46.000000000 +0100
@@ -453,7 +453,7 @@
#ifdef REDO
ch =
#endif
- ynq("Name an individual object?")) {
+ nhynq("Name an individual object?")) {
case 'q':
break;
case 'y':
--- nethack-3.4.3/src/eat.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/src/eat.c 2003-12-16 19:39:46.000000000 +0100
@@ -1060,7 +1060,7 @@
}
if (which == 0) what = makeplural(what);
pline("It smells like %s%s.", (which == 2) ? "the " : "", what);
- if (yn("Eat it?") == 'n') {
+ if (nhyn("Eat it?") == 'n') {
if (!Hallucination) tin.tin->dknown = tin.tin->known = TRUE;
if (flags.verbose) You("discard the open tin.");
costly_tin((const char*)0);
@@ -1103,7 +1103,7 @@
else
pline("It contains spinach.");
- if (yn("Eat it?") == 'n') {
+ if (nhyn("Eat it?") == 'n') {
if (!Hallucination && !tin.tin->cursed)
tin.tin->dknown = tin.tin->known = TRUE;
if (flags.verbose)
--- nethack-3.4.3/src/end.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/src/end.c 2003-12-16 19:39:46.000000000 +0100
@@ -112,7 +112,7 @@
int
done2()
{
- if(yn("Really quit?") == 'n') {
+ if(nhyn("Really quit?") == 'n') {
#ifndef NO_SIGNAL
(void) signal(SIGINT, (SIG_RET_TYPE) done1);
#endif
@@ -138,7 +138,7 @@
const char *tmp = "Dump core?";
# endif
# endif
- if ((c = ynq(tmp)) == 'y') {
+ if ((c = nhynq(tmp)) == 'y') {
(void) signal(SIGINT, (SIG_RET_TYPE) done1);
exit_nhwindows((char *)0);
NH_abort();
@@ -596,7 +596,7 @@
wizard ||
#endif
discover) && (how <= GENOCIDED)) {
- if(yn("Die?") == 'y') goto die;
+ if(nhyn("Die?") == 'y') goto die;
pline("OK, so you don't %s.",
(how == CHOKING) ? "choke" : "die");
if(u.uhpmax <= 0) u.uhpmax = u.ulevel * 8; /* arbitrary */
@@ -725,7 +725,7 @@
if (bones_ok) {
#ifdef WIZARD
- if (!wizard || yn("Save bones?") == 'y')
+ if (!wizard || nhyn("Save bones?") == 'y')
#endif
savebones(corpse);
/* corpse may be invalid pointer now so
--- nethack-3.4.3/src/fountain.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/src/fountain.c 2003-12-16 19:39:46.000000000 +0100
@@ -173,7 +173,7 @@
}
#ifdef WIZARD
if (isyou && wizard) {
- if (yn("Dry up fountain?") == 'n')
+ if (nhyn("Dry up fountain?") == 'n')
return;
}
#endif
--- nethack-3.4.3/src/invent.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/src/invent.c 2003-12-16 19:39:46.000000000 +0100
@@ -1404,7 +1404,7 @@
xprname(otmp, (char *)0, ilet, !nodot, 0L, 0L));
Strcat(qbuf, "?");
sym = (takeoff || ident || otmp->quan < 2L) ?
- nyaq(qbuf) : nyNaq(qbuf);
+ nhnyaq(qbuf) : nhnyNaq(qbuf);
}
else sym = 'y';
--- nethack-3.4.3/src/lock.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/src/lock.c 2003-12-16 19:39:46.000000000 +0100
@@ -311,7 +311,7 @@
doname(otmp), an(simple_typename(otmp->otyp)), "a box"),
verb, it ? "it" : "its lock");
- c = ynq(qbuf);
+ c = nhynq(qbuf);
if(c == 'q') return(0);
if(c == 'n') continue;
@@ -404,7 +404,7 @@
Sprintf(qbuf,"%sock it?",
(door->doormask & D_LOCKED) ? "Unl" : "L" );
- c = yn(qbuf);
+ c = nhyn(qbuf);
if(c == 'n') return(0);
switch(picktyp) {
@@ -476,7 +476,7 @@
doname(otmp), an(simple_typename(otmp->otyp)),
"a box"));
- c = ynq(qbuf);
+ c = nhynq(qbuf);
if(c == 'q') return(0);
if(c == 'n') continue;
--- nethack-3.4.3/src/mhitu.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/src/mhitu.c 2003-12-16 19:39:46.000000000 +0100
@@ -2188,7 +2188,7 @@
safe_qbuf("",sizeof("\"That looks pretty. May I have it?\""),
xname(ring), simple_typename(ring->otyp), "ring"));
makeknown(RIN_ADORNMENT);
- if (yn(qbuf) == 'n') continue;
+ if (nhyn(qbuf) == 'n') continue;
} else pline("%s decides she'd like your %s, and takes it.",
Blind ? "She" : Monnam(mon), xname(ring));
makeknown(RIN_ADORNMENT);
@@ -2211,7 +2211,7 @@
sizeof("\"That looks pretty. Would you wear it for me?\""),
xname(ring), simple_typename(ring->otyp), "ring"));
makeknown(RIN_ADORNMENT);
- if (yn(qbuf) == 'n') continue;
+ if (nhyn(qbuf) == 'n') continue;
} else {
pline("%s decides you'd look prettier wearing your %s,",
Blind ? "He" : Monnam(mon), xname(ring));
@@ -2419,7 +2419,7 @@
Sprintf(qbuf,"\"Shall I remove your %s, %s?\"",
str,
(!rn2(2) ? "lover" : !rn2(2) ? "dear" : "sweetheart"));
- if (yn(qbuf) == 'n') return;
+ if (nhyn(qbuf) == 'n') return;
} else {
char hairbuf[BUFSZ];
--- nethack-3.4.3/src/pager.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/src/pager.c 2003-12-16 19:39:46.000000000 +0100
@@ -421,7 +421,7 @@
return;
}
- if (user_typed_name || without_asking || yn("More info?") == 'y') {
+ if (user_typed_name || without_asking || nhyn("More info?") == 'y') {
winid datawin;
if (dlb_fseek(fp, txt_offset + entry_offset, SEEK_SET) < 0) {
@@ -475,7 +475,7 @@
if (quick) {
from_screen = TRUE; /* yes, we want to use the cursor */
} else {
- i = ynq("Specify unknown object by cursor?");
+ i = nhynq("Specify unknown object by cursor?");
if (i == 'q') return 0;
from_screen = (i == 'y');
}
--- nethack-3.4.3/src/polyself.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/src/polyself.c 2003-12-16 19:39:46.000000000 +0100
@@ -974,7 +974,7 @@
Sprintf(qbuf, "Really %s %s?",
(adtyp == AD_CONF) ? "confuse" : "attack",
mon_nam(mtmp));
- if (yn(qbuf) != 'y') continue;
+ if (nhyn(qbuf) != 'y') continue;
setmangry(mtmp);
}
if (!mtmp->mcanmove || mtmp->mstun || mtmp->msleeping ||
--- nethack-3.4.3/src/pray.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/src/pray.c 2003-12-16 19:39:46.000000000 +0100
@@ -1555,7 +1555,7 @@
{
/* Confirm accidental slips of Alt-P */
if (flags.prayconfirm)
- if (yn("Are you sure you want to pray?") == 'n')
+ if (nhyn("Are you sure you want to pray?") == 'n')
return 0;
u.uconduct.gnostic++;
@@ -1570,7 +1570,7 @@
#ifdef WIZARD
if (wizard && p_type >= 0) {
- if (yn("Force the gods to be pleased?") == 'y') {
+ if (nhyn("Force the gods to be pleased?") == 'y') {
u.ublesscnt = 0;
if (u.uluck < 0) u.uluck = 0;
if (u.ualign.record <= 0) u.ualign.record = 1;
--- nethack-3.4.3/src/read.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/src/read.c 2003-12-16 19:39:46.000000000 +0100
@@ -1014,7 +1014,7 @@
else {
if (sobj->blessed && !Teleport_control) {
known = TRUE;
- if (yn("Do you wish to teleport?")=='n')
+ if (nhyn("Do you wish to teleport?")=='n')
break;
}
tele();
--- nethack-3.4.3/src/rumors.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/src/rumors.c 2003-12-16 19:39:46.000000000 +0100
@@ -314,7 +314,7 @@
Sprintf(qbuf,
"\"Wilt thou settle for a minor consultation?\" (%d %s)",
minor_cost, currency((long)minor_cost));
- switch (ynq(qbuf)) {
+ switch (nhynq(qbuf)) {
default:
case 'q':
return 0;
@@ -339,7 +339,7 @@
Sprintf(qbuf,
"\"Then dost thou desire a major one?\" (%d %s)",
major_cost, currency((long)major_cost));
- if (yn(qbuf) != 'y') return 0;
+ if (nhyn(qbuf) != 'y') return 0;
#ifndef GOLDOBJ
u_pay = (u.ugold < (long)major_cost ? (int)u.ugold
: major_cost);
--- nethack-3.4.3/src/save.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/src/save.c 2003-12-16 19:39:46.000000000 +0100
@@ -55,7 +55,7 @@
dosave()
{
clear_nhwindow(WIN_MESSAGE);
- if(yn("Really save?") == 'n') {
+ if(nhyn("Really save?") == 'n') {
clear_nhwindow(WIN_MESSAGE);
if(multi > 0) nomul(0);
} else {
@@ -140,7 +140,7 @@
(void) close(fd);
clear_nhwindow(WIN_MESSAGE);
There("seems to be an old save file.");
- if (yn("Overwrite the old file?") == 'n') {
+ if (nhyn("Overwrite the old file?") == 'n') {
compress(fq_save);
return 0;
}
--- nethack-3.4.3/src/shk.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/src/shk.c 2003-12-16 19:39:46.000000000 +0100
@@ -1418,7 +1418,7 @@
/* this isn't quite right; it itemizes without asking if the
* single item on the bill is partly used up and partly unpaid */
- itemize = (eshkp->billct > 1 ? yn("Itemized billing?") == 'y' : 1);
+ itemize = (eshkp->billct > 1 ? nhyn("Itemized billing?") == 'y' : 1);
for (pass = 0; pass <= 1; pass++) {
tmp = 0;
@@ -1535,7 +1535,7 @@
char qbuf[BUFSZ];
Sprintf(qbuf,"%s for %ld %s. Pay?", quan == 1L ?
Doname2(obj) : doname(obj), ltmp, currency(ltmp));
- if (yn(qbuf) == 'n') {
+ if (nhyn(qbuf) == 'n') {
buy = PAY_SKIP; /* don't want to buy */
} else if (quan < bp->bquan && !consumed) { /* partly used goods */
obj->quan = bp->bquan - save_quan; /* used up amount */
@@ -2681,7 +2681,7 @@
/* won't accept 'a' response here */
/* KLY - 3/2000 yes, we will, it's a damn nuisance
to have to constantly hit 'y' to sell for credit */
- c = ynaq(qbuf);
+ c = nhynaq(qbuf);
if (c == 'a') {
c = 'y';
auto_credit = TRUE;
@@ -2730,7 +2730,7 @@
"it" : "them");
} else qbuf[0] = '\0'; /* just to pacify lint */
- switch (sell_response ? sell_response : ynaq(qbuf)) {
+ switch (sell_response ? sell_response : nhynaq(qbuf)) {
case 'q': sell_response = 'n';
case 'n': if (container)
dropped_container(obj, shkp, FALSE);
@@ -3577,7 +3577,7 @@
if (Invis) Your("invisibility does not fool %s!", shkname(shkp));
Sprintf(qbuf,"\"Cad! You did %ld %s worth of damage!\" Pay? ",
cost_of_damage, currency(cost_of_damage));
- if(yn(qbuf) != 'n') {
+ if(nhyn(qbuf) != 'n') {
cost_of_damage = check_credit(cost_of_damage, shkp);
#ifndef GOLDOBJ
u.ugold -= cost_of_damage;
--- nethack-3.4.3/src/spell.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/src/spell.c 2003-12-16 19:39:46.000000000 +0100
@@ -448,7 +448,7 @@
Sprintf(qbuf,
"This spellbook is %sdifficult to comprehend. Continue?",
(read_ability < 12 ? "very " : ""));
- if (yn(qbuf) != 'y') {
+ if (nhyn(qbuf) != 'y') {
spellbook->in_use = FALSE;
return(1);
}
--- nethack-3.4.3/src/steed.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/src/steed.c 2003-12-16 19:39:46.000000000 +0100
@@ -176,7 +176,7 @@
dismount_steed(DISMOUNT_BYCHOICE);
else if (getdir((char *)0) && isok(u.ux+u.dx, u.uy+u.dy)) {
#ifdef WIZARD
- if (wizard && yn("Force the mount to succeed?") == 'y')
+ if (wizard && nhyn("Force the mount to succeed?") == 'y')
forcemount = TRUE;
#endif
return (mount_steed(m_at(u.ux+u.dx, u.uy+u.dy), forcemount));
@@ -220,7 +220,7 @@
if (Wounded_legs) {
Your("%s are in no shape for riding.", makeplural(body_part(LEG)));
#ifdef WIZARD
- if (force && wizard && yn("Heal your legs?") == 'y')
+ if (force && wizard && nhyn("Heal your legs?") == 'y')
HWounded_legs = EWounded_legs = 0;
else
#endif
--- nethack-3.4.3/src/teleport.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/src/teleport.c 2003-12-16 19:39:46.000000000 +0100
@@ -464,7 +464,7 @@
if (trap) {
if (trap->once) {
pline("This is a vault teleport, usable once only.");
- if (yn("Jump in?") == 'n')
+ if (nhyn("Jump in?") == 'n')
trap = 0;
else {
deltrap(trap);
@@ -643,7 +643,7 @@
if (newlev == 0) {
if (trycnt >= 10)
goto random_levtport;
- if (ynq("Go to Nowhere. Are you sure?") != 'y') return;
+ if (nhynq("Go to Nowhere. Are you sure?") != 'y') return;
You("%s in agony as your body begins to warp...",
is_silent(youmonst.data) ? "writhe" : "scream");
display_nhwindow(WIN_MESSAGE, FALSE);
--- nethack-3.4.3/src/uhitm.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/src/uhitm.c 2003-12-16 19:39:46.000000000 +0100
@@ -200,7 +200,7 @@
}
if (canspotmon(mtmp)) {
Sprintf(qbuf, "Really attack %s?", mon_nam(mtmp));
- if (yn(qbuf) != 'y') {
+ if (nhyn(qbuf) != 'y') {
flags.move = 0;
return(TRUE);
}
--- nethack-3.4.3/src/weapon.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/src/weapon.c 2003-12-16 19:39:46.000000000 +0100
@@ -862,7 +862,7 @@
boolean speedy = FALSE;
#ifdef WIZARD
- if (wizard && yn("Advance skills without practice?") == 'y')
+ if (wizard && nhyn("Advance skills without practice?") == 'y')
speedy = TRUE;
#endif
--- nethack-3.4.3/src/were.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/src/were.c 2003-12-16 19:39:46.000000000 +0100
@@ -142,7 +142,7 @@
/* `+4' => skip "were" prefix to get name of beast */
Sprintf(qbuf, "Do you want to change into %s? ",
an(mons[u.ulycn].mname+4));
- if(yn(qbuf) == 'n') return;
+ if(nhyn(qbuf) == 'n') return;
}
(void) polymon(u.ulycn);
}
@@ -156,7 +156,7 @@
u.ulycn = NON_PM; /* cure lycanthropy */
}
if (!Unchanging && is_were(youmonst.data) &&
- (!Polymorph_control || yn("Remain in beast form?") == 'n'))
+ (!Polymorph_control || nhyn("Remain in beast form?") == 'n'))
rehumanize();
}
--- nethack-3.4.3/src/potion.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/src/potion.c 2003-12-16 19:40:31.000000000 +0100
@@ -334,7 +334,7 @@
}
/* Is there a fountain to drink from here? */
if (IS_FOUNTAIN(levl[u.ux][u.uy].typ) && !Levitation) {
- if(yn("Drink from the fountain?") == 'y') {
+ if(nhyn("Drink from the fountain?") == 'y') {
drinkfountain();
return 1;
}
@@ -342,7 +342,7 @@
#ifdef SINKS
/* Or a kitchen sink? */
if (IS_SINK(levl[u.ux][u.uy].typ)) {
- if (yn("Drink from the sink?") == 'y') {
+ if (nhyn("Drink from the sink?") == 'y') {
drinksink();
return 1;
}
@@ -351,7 +351,7 @@
/* Or are you surrounded by water? */
if (Underwater) {
- if (yn("Drink the water around you?") == 'y') {
+ if (nhyn("Drink the water around you?") == 'y') {
pline("Do you know what lives in this water!");
return 1;
}
@@ -1539,14 +1539,14 @@
here = levl[u.ux][u.uy].typ;
/* Is there a fountain to dip into here? */
if (IS_FOUNTAIN(here)) {
- if(yn("Dip it into the fountain?") == 'y') {
+ if(nhyn("Dip it into the fountain?") == 'y') {
dipfountain(obj);
return(1);
}
} else if (is_pool(u.ux,u.uy)) {
tmp = waterbody_name(u.ux,u.uy);
Sprintf(qbuf, "Dip it into the %s?", tmp);
- if (yn(qbuf) == 'y') {
+ if (nhyn(qbuf) == 'y') {
if (Levitation) {
floating_above(tmp);
#ifdef STEED
--- nethack-3.4.3/src/apply.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/src/apply.c 2003-12-16 19:39:46.000000000 +0100
@@ -937,7 +937,7 @@
Sprintf(eos(qbuf), " to %s?",
safe_qbuf(qbuf, sizeof(" to ?"), the(xname(otmp)),
the(simple_typename(otmp->otyp)), "it"));
- if(yn(qbuf) == 'n') {
+ if(nhyn(qbuf) == 'n') {
if (!obj->lamplit)
You("try to light %s...", the(xname(obj)));
use_lamp(obj);
@@ -2037,7 +2037,7 @@
mon_nam(u.usteed));
Sprintf(buf, "Continue your attempt to set %s?",
the(defsyms[trap_to_defsym(what_trap(ttyp))].explanation));
- if(yn(buf) == 'y') {
+ if(nhyn(buf) == 'y') {
if (chance) {
switch(ttyp) {
case LANDMINE: /* set it off */
@@ -2613,7 +2613,7 @@
Sprintf(confirm, "Are you really sure you want to break %s?",
safe_qbuf("", sizeof("Are you really sure you want to break ?"),
the_wand, ysimple_name(obj), "the wand"));
- if (yn(confirm) == 'n' ) return 0;
+ if (nhyn(confirm) == 'n' ) return 0;
if (nohands(youmonst.data)) {
You_cant("break %s without hands!", the_wand);
--- nethack-3.4.3/src/music.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/src/music.c 2003-12-16 19:39:46.000000000 +0100
@@ -486,10 +486,10 @@
return(0);
}
if (instr->otyp != LEATHER_DRUM && instr->otyp != DRUM_OF_EARTHQUAKE) {
- c = yn("Improvise?");
+ c = nhyn("Improvise?");
}
if (c == 'n') {
- if (u.uevent.uheard_tune == 2 && yn("Play the passtune?") == 'y') {
+ if (u.uevent.uheard_tune == 2 && nhyn("Play the passtune?") == 'y') {
Strcpy(buf, tune);
} else {
getlin("What tune are you playing? [5 notes, A-G]", buf);
--- nethack-3.4.3/src/pickup.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/src/pickup.c 2003-12-16 19:39:46.000000000 +0100
@@ -553,7 +553,7 @@
Sprintf(qbuf, "Pick up %s?",
safe_qbuf("", sizeof("Pick up ?"), doname(obj),
an(simple_typename(obj->otyp)), "something"));
- switch ((obj->quan < 2L) ? ynaq(qbuf) : ynNaq(qbuf)) {
+ switch ((obj->quan < 2L) ? nhynaq(qbuf) : nhynNaq(qbuf)) {
case 'q': goto end_query; /* out 2 levels */
case 'n': continue;
case 'a':
@@ -1188,7 +1188,7 @@
safe_qbuf(qbuf, sizeof(" . Continue?"),
doname(obj), an(simple_typename(obj->otyp)), "something"));
obj->quan = savequan;
- switch (ynq(qbuf)) {
+ switch (nhynq(qbuf)) {
case 'q': result = -1; break;
case 'n': result = 0; break;
default: break; /* 'y' => result == 1 */
@@ -1540,7 +1540,7 @@
safe_qbuf("", sizeof("There is here, loot it?"),
doname(cobj), an(simple_typename(cobj->otyp)),
"a container"));
- c = ynq(qbuf);
+ c = nhynq(qbuf);
if (c == 'q') return (timepassed);
if (c == 'n') continue;
any = TRUE;
--- nethack-3.4.3/src/trap.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/src/trap.c 2003-12-16 19:39:46.000000000 +0100
@@ -3436,7 +3436,7 @@
(containercnt == 1) ? "is a container" : "are containers",
an(defsyms[trap_to_defsym(ttmp->ttyp)].explanation),
ttmp->ttyp == WEB ? "Remove" : "Disarm", the_trap);
- switch (ynq(qbuf)) {
+ switch (nhynq(qbuf)) {
case 'q': return(0);
case 'n': trap_skipped = TRUE;
deal_with_floor_trap = FALSE;
@@ -3486,7 +3486,7 @@
Sprintf(qbuf, "There is %s here. Check it for traps?",
safe_qbuf("", sizeof("There is here. Check it for traps?"),
doname(otmp), an(simple_typename(otmp->otyp)), "a box"));
- switch (ynq(qbuf)) {
+ switch (nhynq(qbuf)) {
case 'q': return(0);
case 'n': continue;
}
@@ -3503,7 +3503,7 @@
You("find a trap on %s!", the(xname(otmp)));
if (!confused) exercise(A_WIS, TRUE);
- switch (ynq("Disarm it?")) {
+ switch (nhynq("Disarm it?")) {
case 'q': return(1);
case 'n': trap_skipped = TRUE; continue;
}
@@ -3568,7 +3568,7 @@
|| (!force && confused && !rn2(3))) {
You("find a trap on the door!");
exercise(A_WIS, TRUE);
- if (ynq("Disarm it?") != 'y') return(1);
+ if (nhynq("Disarm it?") != 'y') return(1);
if (levl[x][y].doormask & D_TRAPPED) {
ch = 15 + (Role_if(PM_ROGUE) ? u.ulevel*3 : u.ulevel);
exercise(A_DEX, TRUE);
--- nethack-3.4.3/sys/be/bemain.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/sys/be/bemain.c 2003-12-16 19:39:46.000000000 +0100
@@ -103,7 +103,7 @@
You("are in non-scoring discovery mode.");
if (discover || wizard) {
- if(yn("Do you want to keep the save file?") == 'n')
+ if(nhyn("Do you want to keep the save file?") == 'n')
(void) delete_savefile();
else {
compress(fqname(SAVEF, SAVEPREFIX, 0));
--- nethack-3.4.3/sys/mac/macmain.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/sys/mac/macmain.c 2003-12-16 19:39:46.000000000 +0100
@@ -114,7 +114,7 @@
check_special_room(FALSE);
if (discover || wizard) {
- if(yn("Do you want to keep the save file?") == 'n')
+ if(nhyn("Do you want to keep the save file?") == 'n')
(void) delete_savefile();
else {
compress(fqname(SAVEF, SAVEPREFIX, 0));
--- nethack-3.4.3/sys/share/pcmain.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/sys/share/pcmain.c 2003-12-16 19:39:46.000000000 +0100
@@ -428,7 +428,7 @@
You("are in non-scoring discovery mode.");
if (discover || wizard) {
- if(yn("Do you want to keep the save file?") == 'n'){
+ if(nhyn("Do you want to keep the save file?") == 'n'){
(void) delete_savefile();
}
}
--- nethack-3.4.3/sys/share/pcunix.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/sys/share/pcunix.c 2003-12-16 19:39:46.000000000 +0100
@@ -153,11 +153,11 @@
if(iflags.window_inited) {
# ifdef SELF_RECOVER
- c = yn("There are files from a game in progress under your name. Recover?");
+ c = rhyn("There are files from a game in progress under your name. Recover?");
# else
pline("There is already a game in progress under your name.");
pline("You may be able to use \"recover %s\" to get it back.\n",tbuf);
- c = yn("Do you want to destroy the old game?");
+ c = rhyn("Do you want to destroy the old game?");
# endif
} else {
# if defined(MSDOS) && defined(NO_TERMS)
--- nethack-3.4.3/sys/unix/unixmain.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/sys/unix/unixmain.c 2003-12-16 19:39:46.000000000 +0100
@@ -264,7 +264,7 @@
wd_message();
if (discover || wizard) {
- if(yn("Do you want to keep the save file?") == 'n')
+ if(nhyn("Do you want to keep the save file?") == 'n')
(void) delete_savefile();
else {
(void) chmod(fq_save,FCMASK); /* back to readable */
--- nethack-3.4.3/sys/unix/unixunix.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/sys/unix/unixunix.c 2003-12-16 19:39:46.000000000 +0100
@@ -150,7 +150,7 @@
(void) close(fd);
if(iflags.window_inited) {
- c = yn("There is already a game in progress under your name. Destroy old game?");
+ c = nhyn("There is already a game in progress under your name. Destroy old game?");
} else {
(void) printf("\nThere is already a game in progress under your name.");
(void) printf(" Destroy old game? [yn] ");
--- nethack-3.4.3/sys/vms/vmsmain.c.gcc32-yn 2003-12-08 00:39:13.000000000 +0100
+++ nethack-3.4.3/sys/vms/vmsmain.c 2003-12-16 19:39:46.000000000 +0100
@@ -204,7 +204,7 @@
wd_message();
if (discover || wizard) {
- if (yn("Do you want to keep the save file?") == 'n')
+ if (nhyn("Do you want to keep the save file?") == 'n')
(void) delete_savefile();
else
(void) chmod(fq_save,FCMASK); /* back to readable */
distrib
>
Arklinux
>
devel
>
i586
>
media
>
main-src
>
by-pkgid
>
c979cd01156d3ed9cd1bd37429e96965
>
files
>
5
