Merge branch 'master' into derek-farming

Reverse merge before final reintegration.

* master: (40 commits)
  Fix magic mapped dark room symbols
  Disclose extinct species alongside genocided ones
  ...

Conflicts:
	doc/fixes35.0
	src/do.c
	src/files.c
	src/invent.c
	src/objnam.c
	sys/share/pcmain.c

src/do.c

@@ -953,7 +953,7 @@ currentlevel_rewrite()
 
 #ifdef MFLOPPY
     if (!savelev(fd, ledger_no(&u.uz), COUNT_SAVE)) {
-        (void) close(fd);
+		(void) nhclose(fd);
         delete_levelfile(ledger_no(&u.uz));
         pline("NetHack is out of disk space for making levels!");
         You("can save, quit, or continue playing.");
@@ -1168,7 +1168,7 @@ boolean at_stairs, falling, portal;
         }
         minit();	/* ZEROCOMP */
         getlev(fd, hackpid, new_ledger, FALSE);
-        (void) close(fd);
+		(void) nhclose(fd);
         oinit(); /* reassign level dependent obj probabilities */
     }
     /* do this prior to level-change pline messages */
@@ -1296,6 +1296,8 @@ boolean at_stairs, falling, portal;
     /* initial movement of bubbles just before vision_recalc */
 	if (Is_waterlevel(&u.uz) || Is_airlevel(&u.uz))
         movebubbles();
+	else if (Is_firelevel(&u.uz))
+	    fumaroles();
 
     if (level_info[new_ledger].flags & FORGOTTEN) {
         forget_map(ALL_MAP);	/* forget the map */