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

2017-10-01 17:19:23 -04:00
parent eafdc9bf05 f18524bef9
commit f8b4f5672c
53 changed files with 3458 additions and 1640 deletions
--- a/include/decl.h
+++ b/include/decl.h
@@ -325,9 +325,7 @@ E NEARDATA char **viz_array;           /* could see/in sight row pointers */

 /* Window system stuff */
 E NEARDATA winid WIN_MESSAGE;
-#ifndef STATUS_VIA_WINDOWPORT
 E NEARDATA winid WIN_STATUS;
-#endif
 E NEARDATA winid WIN_MAP, WIN_INVEN;

 /* pline (et al) for a single string argument (suppress compiler warning) */