Fix some warnings on the unconditionals branch.

diff --git a/src/eat.c b/src/eat.c
index 67e4b88b92bc7a6d944e7b08b92e54044457422f..320fa23518379db37ca90f89eb0d055e0aef6ccc 100644 (file)
--- 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 e8587784090117e389fb0cf89142e0b7a059bcb9..d1bd4b25091b4eca65e994008f475c2c8c9f9329 100644 (file)
--- 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 ba3ee79f31ffb7cece8bb3df406defb416f224a9..6914af2506cf6ea8c547076ce6c469e4d0c71f69 100644 (file)
--- 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),