Merge branch 'NetHack-3.6'

2019-07-13 00:38:10 -04:00
parent b7a4a8b202 64cc11d9b4
commit 77fd719e05
27 changed files with 123 additions and 89 deletions
--- a/src/objnam.c
+++ b/src/objnam.c
@@ -411,7 +411,7 @@ struct obj *obj;
    return xname_flags(obj, CXN_NORMAL);
 }

-char *
+STATIC_OVL char *
 xname_flags(obj, cxn_flags)
 register struct obj *obj;
 unsigned cxn_flags; /* bitmask of CXN_xxx values */
@@ -2570,7 +2570,7 @@ const char *oldstr;
    return bp;
 }

-boolean
+STATIC_OVL boolean
 badman(basestr, to_plural)
 const char *basestr;
 boolean to_plural;            /* true => makeplural, false => makesingular */