Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource

.gitignore

@@ -39,6 +39,10 @@ Nethack.sdf
 Nethack.opensdf
 Makefile.bcc
 Makefile.gcc
+Makefile-orig
+Makefile.bcc-orig
+Makefile.gcc-orig
+*.suo
 *.pdb
 *.ilk
 # Win32-specific ignores end

include/decl.h

@@ -341,7 +341,7 @@ E nhwchar toplines[];
 #define verbalize1(cstr) verbalize("%s", cstr)
 #define You_hear1(cstr) You_hear("%s", cstr)
 #define Sprintf1(buf, cstr) Sprintf(buf, "%s", cstr)
-#define panic1(cstr) panic(cstr)
+#define panic1(cstr) panic("%s", cstr)
 
 #ifndef TCAP_H
 E struct tc_gbl_data {	/* also declared in tcap.h */

src/botl.c

@@ -1353,7 +1353,7 @@ genl_status_init()
 		vals[i] = (char *)alloc(MAXCO);
 		*vals[i] = '\0';
 		activefields[i] = FALSE;
-		fieldfmt[i] = FALSE;
+		fieldfmt[i] = (const char *)0;
 	}
 	/* Use a window for the genl version; backward port compatibility */
 	WIN_STATUS = create_nhwindow(NHW_STATUS);

src/region.c

@@ -1052,7 +1052,7 @@ region_safety()
 	pline_The("gas cloud has dissipated.");
     }
     /* maybe cure blindness too */
-    if ((Blinded && TIMEOUT) == 1L) make_blinded(0L, TRUE);
+    if ((Blinded & TIMEOUT) == 1L) make_blinded(0L, TRUE);
 }
 
 /*region.c*/

sys/share/unixtty.c

@@ -380,6 +380,7 @@ init_sco_cons()
 
 #ifdef __linux__		/* via Jesse Thilo and Ben Gertzfield */
 # include <sys/vt.h>
+# include <sys/ioctl.h>
 
 int linux_flag_console = 0;