From 8a570295035d32465af8228e06adbd9bf706c106 Mon Sep 17 00:00:00 2001 From: PatR Date: Wed, 11 Dec 2019 12:35:45 -0800 Subject: [PATCH 1/3] spelling and typo fixes Submitted for 3.7.0; all but one also apply to 3.6.3. I rewrote the curses terminal-too-small message instead of just fixing the spelling of "minumum". --- doc/fixes36.4 | 1 + src/bones.c | 2 +- src/hack.c | 2 +- src/options.c | 2 +- src/potion.c | 2 +- src/shk.c | 2 +- src/timeout.c | 4 ++-- src/trap.c | 4 ++-- win/curses/cursmain.c | 7 +++++-- win/curses/curswins.c | 2 +- win/tty/topl.c | 2 +- win/tty/wintty.c | 2 +- 12 files changed, 18 insertions(+), 14 deletions(-) diff --git a/doc/fixes36.4 b/doc/fixes36.4 index e841af4f6..5865224cc 100644 --- a/doc/fixes36.4 +++ b/doc/fixes36.4 @@ -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 diff --git a/src/bones.c b/src/bones.c index d5623fcde..da0de0f41 100644 --- a/src/bones.c +++ b/src/bones.c @@ -598,7 +598,7 @@ getbones() if (validate(fd, 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; diff --git a/src/hack.c b/src/hack.c index dca467262..a48b92cf5 100644 --- a/src/hack.c +++ b/src/hack.c @@ -2840,7 +2840,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)); diff --git a/src/options.c b/src/options.c index 19f189813..c06be7605 100644 --- a/src/options.c +++ b/src/options.c @@ -395,7 +395,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", diff --git a/src/potion.c b/src/potion.c index 16b2c5dda..c6dffc5f9 100644 --- a/src/potion.c +++ b/src/potion.c @@ -2260,7 +2260,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 diff --git a/src/shk.c b/src/shk.c index 815c2e726..6772da453 100644 --- a/src/shk.c +++ b/src/shk.c @@ -4396,7 +4396,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!'", diff --git a/src/timeout.c b/src/timeout.c index e3125d8a5..f9df132db 100644 --- a/src/timeout.c +++ b/src/timeout.c @@ -93,7 +93,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 }, }; @@ -1398,7 +1398,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) diff --git a/src/trap.c b/src/trap.c index d1014fafc..51436d47a 100644 --- a/src/trap.c +++ b/src/trap.c @@ -1591,7 +1591,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); @@ -1599,7 +1599,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); diff --git a/win/curses/cursmain.c b/win/curses/cursmain.c index e56f0e3ab..1328a4828 100644 --- a/win/curses/cursmain.c +++ b/win/curses/cursmain.c @@ -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(); /* / or possibly */ diff --git a/win/curses/curswins.c b/win/curses/curswins.c index 81d8ab435..bd2f505e8 100644 --- a/win/curses/curswins.c +++ b/win/curses/curswins.c @@ -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; } diff --git a/win/tty/topl.c b/win/tty/topl.c index 62fb3eb53..7156bdbce 100644 --- a/win/tty/topl.c +++ b/win/tty/topl.c @@ -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': diff --git a/win/tty/wintty.c b/win/tty/wintty.c index dd1e34009..ea02b631e 100644 --- a/win/tty/wintty.c +++ b/win/tty/wintty.c @@ -1057,7 +1057,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"); From 49fdd32d4f3463124d6fd68b5504479b2705ec78 Mon Sep 17 00:00:00 2001 From: PatR Date: Thu, 12 Dec 2019 12:16:50 -0800 Subject: [PATCH 2/3] comment typo --- src/do.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/do.c b/src/do.c index f27d82e6a..b7bb737b9 100644 --- a/src/do.c +++ b/src/do.c @@ -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. */ @@ -338,7 +338,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)); From 62c271f21b2aecb926a7ed0ed465cb6404bcddb5 Mon Sep 17 00:00:00 2001 From: PatR Date: Fri, 13 Dec 2019 14:01:28 -0800 Subject: [PATCH 3/3] polymorphed steed phrasing When you ride your steed into a polymorph trap and it changes into a creature that can still wear the saddle, the message is |You have to adjust youself in the saddle on . which sounds as if the game is telling the player that he or she needs to do something. Simplify it to |You adjust yourself in the saddle on . --- src/trap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/trap.c b/src/trap.c index 51436d47a..941025654 100644 --- a/src/trap.c +++ b/src/trap.c @@ -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. */ @@ -1639,7 +1639,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;