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

(required manual merge in include/config.h)

src/mkmaze.c

@@ -500,7 +500,7 @@ fixup_special()
                 s_level *sp = find_level(r->rname.str);
                 lev = sp->dlevel;
             }
-        /* fall into... */
+            /*FALLTHRU*/
 
         case LR_UPSTAIR:
         case LR_DOWNSTAIR:
@@ -1198,11 +1198,6 @@ fumaroles()
  * other source files, but they are all so nicely encapsulated here.
  */
 
-#define CONS_OBJ 0
-#define CONS_MON 1
-#define CONS_HERO 2
-#define CONS_TRAP 3
-
 static struct bubble *bbubbles, *ebubbles;
 
 static struct trap *wportal;