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/util/makedefs.c
+++ b/util/makedefs.c
@@ -1515,14 +1515,11 @@ static const char *build_opts[] = {
 #ifdef SHELL
    "shell command",
 #endif
-#ifdef STATUS_VIA_WINDOWPORT
-# ifdef STATUS_HILITES
-    "status via windowport with highlighting",
-# else
-    "status via windowport without highlighting",
-# endif
-#else
    "traditional status display",
+#ifdef STATUS_HILITES
+    "status via windowport with highlighting",
+#else
+    "status via windowport without highlighting",
 #endif
 #ifdef SUSPEND
    "suspend command",