Merge branch 'NetHack-3.6'

diff --cc src/mhitu.c
Simple merge

diff --cc src/mkmaze.c
index e1c176a9420021f5f7034784bf6d7aace0d74de6,2a8dc226c2b2f27b81b3f65229f167208fde2f31..f835d5ca137d04961f3c0ec82e06ebbf972ad6c4
--- 1/src/mkmaze.c
--- 2/src/mkmaze.c
+++ b/src/mkmaze.c
@@@ -1395,9 -1403,14 +1391,14 @@@ movebubbles(
                                           0, 0, 0, 0, 0, 0 };
      static const struct rm air_pos = { cmap_to_glyph(S_cloud), AIR, 0, 0, 0,
                                         1, 0, 0, 0, 0 };
+     static boolean up = FALSE;
+     struct bubble *b;
+     struct container *cons;
+     struct trap *btrap;
+     int x, y, i, j;
  
      /* set up the portal the first time bubbles are moved */
 -    if (!wportal)
 +    if (!g.wportal)
          set_wportal();
  
      vision_recalc(2);
@@@ -1425,11 -1438,8 +1426,8 @@@
                          /* pick up objects, monsters, hero, and traps */
                          if (OBJ_AT(x, y)) {
                              struct obj *olist = (struct obj *) 0, *otmp;
-                             struct container *cons =
-                                 (struct container *) alloc(
-                                     sizeof(struct container));
  
 -                            while ((otmp = level.objects[x][y]) != 0) {
 +                            while ((otmp = g.level.objects[x][y]) != 0) {
                                  remove_object(otmp);
                                  otmp->ox = otmp->oy = 0;
                                  otmp->nexthere = olist;

diff --cc sys/winnt/Makefile.msc
Simple merge