Merge branch 'master' into derek-farming

* master: (160 commits)
  Add doors correctly
  bug fixes for nhsub
  Generate oracle monsters after subroom
  Generate minetown guards after subrooms
  ...

Conflicts:
	src/do.c
	src/files.c
	src/hack.c
	src/mon.c
	src/vision.c

src/mon.c

@@ -297,9 +297,10 @@ unsigned corpseflags;
                 obj = mkcorpstat(CORPSE, KEEPTRAITS(mtmp) ? mtmp : 0,
                         mdat, x, y, corpstatflags);
                 if (burythem) {
-                (void) bury_an_obj(obj);
+			boolean dealloc;
+			(void) bury_an_obj(obj, &dealloc);
                 newsym(x, y);
-                return obj;
+			return (dealloc ? NULL : obj);
                 }
             }
         break;