Merge branch 'NetHack-3.6.2'
This commit is contained in:
@@ -53,7 +53,7 @@
|
||||
#endif
|
||||
|
||||
#if defined(UNIX) && !defined(LINT) && !defined(GCC_WARN)
|
||||
static const char SCCS_Id[] = "@(#)makedefs.c\t3.6\t2018/03/02";
|
||||
static const char SCCS_Id[] UNUSED = "@(#)makedefs.c\t3.6\t2018/03/02";
|
||||
#endif
|
||||
|
||||
/* names of files to be generated */
|
||||
@@ -297,6 +297,7 @@ link_sanity_check()
|
||||
*/
|
||||
monst_init();
|
||||
objects_init();
|
||||
|
||||
}
|
||||
|
||||
void
|
||||
@@ -1664,6 +1665,9 @@ static struct win_info window_opts[] = {
|
||||
#ifdef TTY_GRAPHICS
|
||||
{ "tty", "traditional tty-based graphics" },
|
||||
#endif
|
||||
#ifdef CURSES_GRAPHICS
|
||||
{ "curses", "terminal-based graphics using curses libraries" },
|
||||
#endif
|
||||
#ifdef X11_GRAPHICS
|
||||
{ "X11", "X11" },
|
||||
#endif
|
||||
|
||||
@@ -20,10 +20,10 @@ extern void NDECL(vms_abort);
|
||||
|
||||
/*VARARGS1*/
|
||||
boolean panicking;
|
||||
void VDECL(panic, (char *, ...));
|
||||
void VDECL(panic, (const char *, ...));
|
||||
|
||||
void panic
|
||||
VA_DECL(char *, str)
|
||||
VA_DECL(const char *, str)
|
||||
{
|
||||
VA_START(str);
|
||||
VA_INIT(str, char *);
|
||||
|
||||
Reference in New Issue
Block a user