nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'NetHack-3.6'

Browse Source
This commit is contained in:
nhmall
2019-12-13 17:37:46 -05:00
parent 4b7c8d5f0f 62c271f21b
commit f48ac58561
13 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/fixes36.4
View File

@@ -10,6 +10,7 @@ GDBPATH and GREPPATH from sysconf or -D... on compilation command line were
being processed even if PANICTRACE was disabled but only being freed
at end of game when that was enabled
fix the article used in the message when your steed encounters a polymorph trap
dozen-ish assorted spelling/typo fixes in messages and source comments
Fixes to Post-3.6.3 Problems that Were Exposed Via git Repository

2
src/bones.c
View File

@@ -625,7 +625,7 @@ getbones()
if (validate(nhfp, g.bones) != 0) {
if (!wizard)
pline("Discarding unuseable bones; no need to panic...");
pline("Discarding unusable bones; no need to panic...");
ok = FALSE;
} else {
ok = TRUE;

4
src/do.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 do.c $NHDT-Date: 1575245055 2019/12/02 00:04:15 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.196 $ */
/* NetHack 3.6 do.c $NHDT-Date: 1576181796 2019/12/12 20:16:36 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.197 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Derek S. Ray, 2015. */
/* NetHack may be freely redistributed. See license for details. */
@@ -336,7 +336,7 @@ polymorph_sink()
sym = S_altar;
levl[u.ux][u.uy].typ = ALTAR;
/* 3.6.3: this used to pass 'rn2(A_LAWFUL + 2) - 1' to
Align2mask() but it evaluates its argument more than once */
Align2amask() but that evaluates its argument more than once */
algn = rn2(3) - 1; /* -1 (A_Cha) or 0 (A_Neu) or +1 (A_Law) */
levl[u.ux][u.uy].altarmask = ((Inhell && rn2(3)) ? AM_NONE
: Align2amask(algn));

2
src/hack.c
View File

@@ -2839,7 +2839,7 @@ int x, y;
if (!IS_DOOR(lev_p->typ))
return FALSE;
/* all rogue level doors are doorless but disallow diagonal access, so
we treat them as if their non-existant doors were actually present */
we treat them as if their non-existent doors were actually present */
if (Is_rogue_level(&u.uz))
return FALSE;
return !(lev_p->doormask & ~(D_NODOOR | D_BROKEN));

2
src/options.c
View File

@@ -393,7 +393,7 @@ static struct Comp_Opt {
},
{ "statuslines",
#ifdef CURSES_GRAPHICS
"2 or 3 lines for horizonal (bottom or top) status display",
"2 or 3 lines for horizontal (bottom or top) status display",
20, SET_IN_GAME
#else
"2 or 3 lines for status display",

2
src/potion.c
View File

@@ -2257,7 +2257,7 @@ dodip()
more_than_one ? " that you dipped into" : "",
newbuf);
else
pline("Somehing happens.");
pline("Something happens.");
if (old_dknown
&& !objects[old_otyp].oc_name_known

2
src/shk.c
View File

@@ -4383,7 +4383,7 @@ const char *Izchak_speaks[] = {
"%s says: 'These shopping malls give me a headache.'",
"%s says: 'Slow down. Think clearly.'",
"%s says: 'You need to take things one at a time.'",
"%s says: 'I don't like poofy coffee... give me Columbian Supremo.'",
"%s says: 'I don't like poofy coffee... give me Colombian Supremo.'",
"%s says that getting the devteam's agreement on anything is difficult.",
"%s says that he has noticed those who serve their deity will prosper.",
"%s says: 'Don't try to steal from me - I have friends in high places!'",

4
src/timeout.c
View File

@@ -95,7 +95,7 @@ const struct propname {
{ UNCHANGING, "unchanging" },
{ REFLECTING, "reflecting" },
{ FREE_ACTION, "free action" },
{ FIXED_ABIL, "fixed abilites" },
{ FIXED_ABIL, "fixed abilities" },
{ LIFESAVED, "life will be saved" },
{ 0, 0 },
};
@@ -1400,7 +1400,7 @@ long timeout;
break; /* case [otyp ==] candelabrum|tallow_candle|wax_candle */
default:
impossible("burn_object: unexpeced obj %s", xname(obj));
impossible("burn_object: unexpected obj %s", xname(obj));
break;
}
if (need_newsym)

8
src/trap.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 trap.c $NHDT-Date: 1569189770 2019/09/22 22:02:50 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.317 $ */
/* NetHack 3.6 trap.c $NHDT-Date: 1576274483 2019/12/13 22:01:23 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.325 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2013. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1588,7 +1588,7 @@ struct obj *otmp;
switch (tt) {
case ARROW_TRAP:
if (!otmp) {
impossible("steed hit by non-existant arrow?");
impossible("steed hit by non-existent arrow?");
return 0;
}
trapkilled = thitm(8, steed, otmp, 0, FALSE);
@@ -1596,7 +1596,7 @@ struct obj *otmp;
break;
case DART_TRAP:
if (!otmp) {
impossible("steed hit by non-existant dart?");
impossible("steed hit by non-existent dart?");
return 0;
}
trapkilled = thitm(7, steed, otmp, 0, FALSE);
@@ -1636,7 +1636,7 @@ struct obj *otmp;
SUPPRESS_SADDLE, FALSE));
if (mdat != steed->data)
(void) strsubst(buf, "your ", "your new ");
You("have to adjust yourself in the saddle on %s.", buf);
You("adjust yourself in the saddle on %s.", buf);
}
}
steedhit = TRUE;

7
win/curses/cursmain.c
View File

@@ -211,8 +211,11 @@ curses_init_nhwindows(int *argcp UNUSED,
getmaxyx(base_term, term_rows, term_cols);
counting = FALSE;
curses_init_options();
if ((term_rows < 15) || (term_cols < 40)) {
panic("Terminal too small. Must be minumum 40 width and 15 height");
if (term_rows < 15 || term_cols < 40) {
panic("Terminal is too small; must have at least %s%s%s.",
(term_rows < 15) ? "15 rows" : "",
(term_rows < 15 && term_cols < 40) ? " and " : "",
(term_cols < 40) ? "40 columns" : "");
}
/* during line input, deletes the most recently typed character */
erase_char = erasechar(); /* <delete>/<rubout> or possibly <backspace> */

2
win/curses/curswins.c
View File

@@ -504,7 +504,7 @@ curses_puts(winid wid, int attr, const char *text)
if (curses_is_menu(wid) || curses_is_text(wid)) {
if (!curses_menu_exists(wid)) {
impossible(
"curses_puts: Attempted write to nonexistant window %d!",
"curses_puts: Attempted write to nonexistent window %d!",
wid);
return;
}

2
win/tty/topl.c
View File

@@ -302,7 +302,7 @@ char c;
register struct WinDesc *cw = wins[WIN_MESSAGE];
if (cw == (struct WinDesc *) 0)
panic("Putsym window MESSAGE nonexistant");
panic("Putsym window MESSAGE nonexistent");
switch (c) {
case '\b':

2
win/tty/wintty.c
View File

@@ -1055,7 +1055,7 @@ reset_role_filtering()
add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_UNSELECTED);
add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE,
"Uncceptable alignments", MENU_UNSELECTED);
"Unacceptable alignments", MENU_UNSELECTED);
setup_algnmenu(win, FALSE, ROLE_NONE, ROLE_NONE, ROLE_NONE);
end_menu(win, "Pick all that apply");