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".
This commit is contained in:
@@ -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
|
being processed even if PANICTRACE was disabled but only being freed
|
||||||
at end of game when that was enabled
|
at end of game when that was enabled
|
||||||
fix the article used in the message when your steed encounters a polymorph trap
|
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
|
Fixes to Post-3.6.3 Problems that Were Exposed Via git Repository
|
||||||
|
|||||||
+1
-1
@@ -598,7 +598,7 @@ getbones()
|
|||||||
|
|
||||||
if (validate(fd, bones) != 0) {
|
if (validate(fd, bones) != 0) {
|
||||||
if (!wizard)
|
if (!wizard)
|
||||||
pline("Discarding unuseable bones; no need to panic...");
|
pline("Discarding unusable bones; no need to panic...");
|
||||||
ok = FALSE;
|
ok = FALSE;
|
||||||
} else {
|
} else {
|
||||||
ok = TRUE;
|
ok = TRUE;
|
||||||
|
|||||||
+1
-1
@@ -2840,7 +2840,7 @@ int x, y;
|
|||||||
if (!IS_DOOR(lev_p->typ))
|
if (!IS_DOOR(lev_p->typ))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
/* all rogue level doors are doorless but disallow diagonal access, so
|
/* 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))
|
if (Is_rogue_level(&u.uz))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
return !(lev_p->doormask & ~(D_NODOOR | D_BROKEN));
|
return !(lev_p->doormask & ~(D_NODOOR | D_BROKEN));
|
||||||
|
|||||||
+1
-1
@@ -395,7 +395,7 @@ static struct Comp_Opt {
|
|||||||
},
|
},
|
||||||
{ "statuslines",
|
{ "statuslines",
|
||||||
#ifdef CURSES_GRAPHICS
|
#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
|
20, SET_IN_GAME
|
||||||
#else
|
#else
|
||||||
"2 or 3 lines for status display",
|
"2 or 3 lines for status display",
|
||||||
|
|||||||
+1
-1
@@ -2260,7 +2260,7 @@ dodip()
|
|||||||
more_than_one ? " that you dipped into" : "",
|
more_than_one ? " that you dipped into" : "",
|
||||||
newbuf);
|
newbuf);
|
||||||
else
|
else
|
||||||
pline("Somehing happens.");
|
pline("Something happens.");
|
||||||
|
|
||||||
if (old_dknown
|
if (old_dknown
|
||||||
&& !objects[old_otyp].oc_name_known
|
&& !objects[old_otyp].oc_name_known
|
||||||
|
|||||||
@@ -4396,7 +4396,7 @@ const char *Izchak_speaks[] = {
|
|||||||
"%s says: 'These shopping malls give me a headache.'",
|
"%s says: 'These shopping malls give me a headache.'",
|
||||||
"%s says: 'Slow down. Think clearly.'",
|
"%s says: 'Slow down. Think clearly.'",
|
||||||
"%s says: 'You need to take things one at a time.'",
|
"%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 getting the devteam's agreement on anything is difficult.",
|
||||||
"%s says that he has noticed those who serve their deity will prosper.",
|
"%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!'",
|
"%s says: 'Don't try to steal from me - I have friends in high places!'",
|
||||||
|
|||||||
+2
-2
@@ -93,7 +93,7 @@ const struct propname {
|
|||||||
{ UNCHANGING, "unchanging" },
|
{ UNCHANGING, "unchanging" },
|
||||||
{ REFLECTING, "reflecting" },
|
{ REFLECTING, "reflecting" },
|
||||||
{ FREE_ACTION, "free action" },
|
{ FREE_ACTION, "free action" },
|
||||||
{ FIXED_ABIL, "fixed abilites" },
|
{ FIXED_ABIL, "fixed abilities" },
|
||||||
{ LIFESAVED, "life will be saved" },
|
{ LIFESAVED, "life will be saved" },
|
||||||
{ 0, 0 },
|
{ 0, 0 },
|
||||||
};
|
};
|
||||||
@@ -1398,7 +1398,7 @@ long timeout;
|
|||||||
break; /* case [otyp ==] candelabrum|tallow_candle|wax_candle */
|
break; /* case [otyp ==] candelabrum|tallow_candle|wax_candle */
|
||||||
|
|
||||||
default:
|
default:
|
||||||
impossible("burn_object: unexpeced obj %s", xname(obj));
|
impossible("burn_object: unexpected obj %s", xname(obj));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (need_newsym)
|
if (need_newsym)
|
||||||
|
|||||||
+2
-2
@@ -1591,7 +1591,7 @@ struct obj *otmp;
|
|||||||
switch (tt) {
|
switch (tt) {
|
||||||
case ARROW_TRAP:
|
case ARROW_TRAP:
|
||||||
if (!otmp) {
|
if (!otmp) {
|
||||||
impossible("steed hit by non-existant arrow?");
|
impossible("steed hit by non-existent arrow?");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
trapkilled = thitm(8, steed, otmp, 0, FALSE);
|
trapkilled = thitm(8, steed, otmp, 0, FALSE);
|
||||||
@@ -1599,7 +1599,7 @@ struct obj *otmp;
|
|||||||
break;
|
break;
|
||||||
case DART_TRAP:
|
case DART_TRAP:
|
||||||
if (!otmp) {
|
if (!otmp) {
|
||||||
impossible("steed hit by non-existant dart?");
|
impossible("steed hit by non-existent dart?");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
trapkilled = thitm(7, steed, otmp, 0, FALSE);
|
trapkilled = thitm(7, steed, otmp, 0, FALSE);
|
||||||
|
|||||||
@@ -211,8 +211,11 @@ curses_init_nhwindows(int *argcp UNUSED,
|
|||||||
getmaxyx(base_term, term_rows, term_cols);
|
getmaxyx(base_term, term_rows, term_cols);
|
||||||
counting = FALSE;
|
counting = FALSE;
|
||||||
curses_init_options();
|
curses_init_options();
|
||||||
if ((term_rows < 15) || (term_cols < 40)) {
|
if (term_rows < 15 || term_cols < 40) {
|
||||||
panic("Terminal too small. Must be minumum 40 width and 15 height");
|
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 */
|
/* during line input, deletes the most recently typed character */
|
||||||
erase_char = erasechar(); /* <delete>/<rubout> or possibly <backspace> */
|
erase_char = erasechar(); /* <delete>/<rubout> or possibly <backspace> */
|
||||||
|
|||||||
@@ -504,7 +504,7 @@ curses_puts(winid wid, int attr, const char *text)
|
|||||||
if (curses_is_menu(wid) || curses_is_text(wid)) {
|
if (curses_is_menu(wid) || curses_is_text(wid)) {
|
||||||
if (!curses_menu_exists(wid)) {
|
if (!curses_menu_exists(wid)) {
|
||||||
impossible(
|
impossible(
|
||||||
"curses_puts: Attempted write to nonexistant window %d!",
|
"curses_puts: Attempted write to nonexistent window %d!",
|
||||||
wid);
|
wid);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -302,7 +302,7 @@ char c;
|
|||||||
register struct WinDesc *cw = wins[WIN_MESSAGE];
|
register struct WinDesc *cw = wins[WIN_MESSAGE];
|
||||||
|
|
||||||
if (cw == (struct WinDesc *) 0)
|
if (cw == (struct WinDesc *) 0)
|
||||||
panic("Putsym window MESSAGE nonexistant");
|
panic("Putsym window MESSAGE nonexistent");
|
||||||
|
|
||||||
switch (c) {
|
switch (c) {
|
||||||
case '\b':
|
case '\b':
|
||||||
|
|||||||
+1
-1
@@ -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, "", MENU_UNSELECTED);
|
||||||
add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE,
|
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);
|
setup_algnmenu(win, FALSE, ROLE_NONE, ROLE_NONE, ROLE_NONE);
|
||||||
|
|
||||||
end_menu(win, "Pick all that apply");
|
end_menu(win, "Pick all that apply");
|
||||||
|
|||||||
Reference in New Issue
Block a user