Merge remote-tracking branch 'origin/NetHack-3.6.0'

2017-08-15 07:59:38 -04:00
parent 54888b3e00 0840974b42
commit 88ed50523d
51 changed files with 2521 additions and 1573 deletions
--- a/util/makedefs.c
+++ b/util/makedefs.c
@@ -2238,9 +2238,6 @@ do_permonst()
    Fprintf(ofp, "%s", Dont_Edit_Code);
    Fprintf(ofp, "#ifndef PM_H\n#define PM_H\n");

-    if (strcmp(mons[0].mname, "playermon") != 0)
-        Fprintf(ofp, "\n#define\tPM_PLAYERMON\t(-1)");
-
    for (i = 0; mons[i].mlet; i++) {
        SpinCursor(3);