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

Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2

Browse Source
This commit is contained in:
nhmall
2018-12-09 16:38:56 -05:00
parent 60c427ed24 d93b8b50ae
commit 32cf832ead
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/fixes36.2
+1
View File
@@ -282,6 +282,7 @@ changing Sting's description to be "(weapon in hand) (light blue aura)" was
to "(weapon in hand, flickering/glimmering/gleaming light blue)" to "(weapon in hand, flickering/glimmering/gleaming light blue)"
fix bit-use collision between WC2_TERM_SIZE and WC2_RESET_STATUS in fix bit-use collision between WC2_TERM_SIZE and WC2_RESET_STATUS in
include/winprocs.h following a recent merge include/winprocs.h following a recent merge
fix foxen pluralization again after underflow remedy reintroduced the problem
tty: turn off an optimization that is the suspected cause of Windows reported tty: turn off an optimization that is the suspected cause of Windows reported
partial status lines following level changes partial status lines following level changes
tty: ensure that current status fields are always copied to prior status tty: ensure that current status fields are always copied to prior status
src/objnam.c
+1 -1
View File
@@ -2115,7 +2115,7 @@ const char *const *alt_as_is; /* another set like as_is[] */
/* skip "ox" -> "oxen" entry when pluralizing "<something>ox" /* skip "ox" -> "oxen" entry when pluralizing "<something>ox"
unless it is muskox */ unless it is muskox */
if (to_plural && baselen > 2 && !strcmpi(endstring - 2, "ox") if (to_plural && baselen > 2 && !strcmpi(endstring - 2, "ox")
&& baselen > 5 && strcmpi(endstring - 6, "muskox")) { && !(baselen > 5 && !strcmpi(endstring - 6, "muskox"))) {
/* "fox" -> "foxes" */ /* "fox" -> "foxes" */
Strcasecpy(endstring, "es"); Strcasecpy(endstring, "es");
return TRUE; return TRUE;