Merge branch 'NetHack-3.6'

dat/bogusmon.txt

@@ -80,6 +80,15 @@ tofurkey
 shrinking violet
 shallow one
 spherical cow
+electric giraffe
+steam dragon
+omnibus
+slinky
+maxotaur
+octahedron
+dungeon core
+quale
+holloway
 
 # Quendor (Zork, &c.)
 grue
@@ -242,6 +251,7 @@ corpulent porpoise
 quokka
 potoo
 lemming
+dhole
 
 # european cryptids
 wolpertinger
@@ -278,6 +288,7 @@ netsplit
 wiki
 peer
 COBOL
+wire shark
 
 # bugs
 bohrbug
@@ -329,6 +340,7 @@ bold face
 boustrophedon
 ligature
 rebus
+dinkus
 
 # Their actual character
 apostrophe golem
@@ -339,6 +351,10 @@ voluptuous ampersand
 +Strong Bad
 +Magical Trevor
 
+# Girl Genius
+smakken
+mimmoth
+
 # KoL
 one-winged dewinged stab-bat
 
@@ -427,6 +443,9 @@ womble
 # Fraggle Rock
 fraggle
 
+# Harry Harrison
+stainless steel rat
+
 # Spoonerism
 mock role
 
@@ -478,6 +497,7 @@ geriatric snake
 gnat ant
 giant bath
 grant beetle
+greater snake
 grind bug
 giant mango
 glossy golem

doc/fixes36.3

@@ -1,4 +1,4 @@
-$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.187 $ $NHDT-Date: 1574387029 2019/11/22 01:43:49 $
+$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.188 $ $NHDT-Date: 1574419578 2019/11/22 10:46:18 $
 
 This fixes36.3 file is here to capture information about updates in the 3.6.x
 lineage following the release of 3.6.2 in May 2019. Please note, however,
@@ -292,6 +292,9 @@ fix several tribute typos
 pluralization correction for unlikely epoch and loch
 ensure that --showpaths displays the personal configuration file last
 don't strip leading slash from hallucinatory monster name "/b/tard"
+quaffing unknown potion of see invisible resulted in asking what to call the
+	potion while updated monster display was buffered so not yet shown,
+	hence potentially noticeable effect was concealed from player
 unix: Fix double DLB definition in linux hints file
 windows: fix --showpaths output for the data file which relies on being
 	constructed programmatically to incorporate the version suffix

src/do_name.c

@@ -1,4 +1,4 @@
-/* NetHack 3.6	do_name.c	$NHDT-Date: 1574387027 2019/11/22 01:43:47 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.151 $ */
+/* NetHack 3.6	do_name.c	$NHDT-Date: 1574419578 2019/11/22 10:46:18 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.152 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Pasi Kallinen, 2018. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -1468,6 +1468,7 @@ struct obj *obj;
 
     if (!obj->dknown)
         return; /* probably blind */
+    flush_screen(1); /* buffered updates might matter to player's response */
 
     if (obj->oclass == POTION_CLASS && obj->fromsink)
         /* kludge, meaning it's sink water */

sys/winnt/Makefile.gcc

@@ -1666,6 +1666,7 @@ $(O)vision.o: vision.c $(HACK_H) $(INCL)/vis_tab.h
 $(O)weapon.o: weapon.c $(HACK_H)
 $(O)were.o: were.c $(HACK_H)
 $(O)wield.o: wield.c $(HACK_H)
+$(O)windmain.o: $(MSWSYS)\windmain.c $(HACK_H)
 $(O)windows.o: windows.c $(HACK_H) $(INCL)/wingem.h $(INCL)/winGnome.h
 $(O)wizard.o: wizard.c $(HACK_H) $(INCL)/qtext.h
 $(O)worm.o: worm.c $(HACK_H) $(INCL)/lev.h