From: Sean Hunt <scshunt@csclub.uwaterloo.ca>
Date: Mon, 16 Feb 2015 07:09:57 +0000 (-0500)
Subject: Fix some warnings on the unconditionals branch.
X-Git-Tag: NetHack-3.6.0_RC01~492^2~109
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=07da4a740ef3b39786abf69515833de3be086b2d;p=nethack

Fix some warnings on the unconditionals branch.
---

diff --git a/src/eat.c b/src/eat.c
index 67e4b88b9..320fa2351 100644
--- a/src/eat.c
+++ b/src/eat.c
@@ -1597,7 +1597,7 @@ start_eating(otmp)		/* called as you start to eat */
 {
 	const char *old_nomovemsg, *save_nomovemsg;
 
-	debugpline("start_eating: %lx (victual = %lx)", otmp, context.victual.piece);
+	debugpline("start_eating: %p (victual = %p)", otmp, context.victual.piece);
 	debugpline("reqtime = %d", context.victual.reqtime);
 	debugpline("(original reqtime = %d)", objects[otmp->otyp].oc_delay);
 	debugpline("nmod = %d", context.victual.nmod);
diff --git a/src/questpgr.c b/src/questpgr.c
index e85877840..d1bd4b250 100644
--- a/src/questpgr.c
+++ b/src/questpgr.c
@@ -12,6 +12,10 @@
 
 #define QTEXT_FILE	"quest.dat"
 
+#ifdef TTY_GRAPHICS
+#include "wintty.h"
+#endif
+
 /* from sp_lev.c, for deliver_splev_message() */
 extern char *lev_message;
 
@@ -49,7 +53,9 @@ dump_qtlist()	/* dump the character msg list to check appearance */
 	for (msg = qt_list.chrole; msg->msgnum > 0; msg++) {
 		pline("msgnum %d: delivery %c",
 			msg->msgnum, msg->delivery);
+#ifdef TTY_GRAPHICS
 		more();
+#endif
 		(void) dlb_fseek(msg_file, msg->offset, SEEK_SET);
 		deliver_by_window(msg, NHW_TEXT);
 	}
diff --git a/util/makedefs.c b/util/makedefs.c
index ba3ee79f3..6914af250 100644
--- a/util/makedefs.c
+++ b/util/makedefs.c
@@ -2256,7 +2256,7 @@ put_qt_hdrs()
 							qt_hdr.n_hdr, ofp);
 #ifdef DEBUG
 	for(i = 0; i < qt_hdr.n_hdr; i++)
-		Fprintf(stderr, "%c @ %ld, ", qt_hdr.id[i], qt_hdr.offset[i]);
+		Fprintf(stderr, "%s @ %ld, ", qt_hdr.id[i], qt_hdr.offset[i]);
 
 	Fprintf(stderr, "\n");
 #endif
@@ -2267,7 +2267,7 @@ put_qt_hdrs()
 	for(i = 0; i < qt_hdr.n_hdr; i++) {
 
 #ifdef DEBUG
-	    Fprintf(stderr, "%ld: %c header info.\n", ftell(ofp),
+	    Fprintf(stderr, "%ld: %s header info.\n", ftell(ofp),
 		    qt_hdr.id[i]);
 #endif
 	    (void) fwrite((genericptr_t)&(msg_hdr[i].n_msg), sizeof(int),