Merge branch 'NetHack-3.6'

This commit is contained in:
nhmall
2019-12-15 18:03:19 -05:00
2 changed files with 9 additions and 0 deletions
+1
View File
@@ -9,6 +9,7 @@ makedefs
dgn_comp dgn_comp
lev_comp lev_comp
dlb dlb
dlb_main
recover recover
tilemap tilemap
tileedit tileedit
+8
View File
@@ -1059,6 +1059,10 @@ rumors_failure:
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
#if (NH_DEVEL_STATUS == NH_STATUS_WIP)
#else
Strcat(subbuf, " post-release");
#endif
void void
do_date() do_date()
{ {
@@ -1361,6 +1365,10 @@ windowing_sanity()
#endif /*DEFAULT_WINDOW_SYS*/ #endif /*DEFAULT_WINDOW_SYS*/
} }
#if (NH_DEVEL_STATUS == NH_STATUS_WIP)
#else
" [post-release]"
#endif
/* routine to decide whether to discard something from data.base */ /* routine to decide whether to discard something from data.base */
static boolean static boolean
d_filter(line) d_filter(line)