Varargs cleanup is almost finished.

diff --git a/extern.h b/extern.h
index 78724ec9a3d06d5e9de4c2ec5da7955708c76b29..70044c161243e421f3f629627fcc2ae6a681d8f1 100644 (file)
--- a/extern.h
+++ b/extern.h
@@ -206,7 +206,7 @@ void scan_sat (view_map_t *vmap, long loc);
 void set_prod (city_info_t *cityp);
 
 /* terminal routines */
-void pdebug (char *s, int a, int b, int c, int d, int e, int f, int g, int h);
+void pdebug (char *s, ...);
 void topini (void);
 void clreol (int line, int colp);
 void topmsg (int line, char *fmt, ...);

diff --git a/term.c b/term.c
index 19e6dcb48d04f47c6d7e9985cba5909f44ee5f57..42ced47e0e045e8e43e3c5a0b227ac2e84408af3 100644 (file)
--- a/term.c
+++ b/term.c
@@ -40,15 +40,6 @@ to read the lines.  The new information is then displayed, and the
 static bool need_delay;
 static FILE *my_stream;
 
-void
-/* VARARGS1 */
-pdebug(char *s, 
-       int a, int b, int c, int d, int e, int f, int g, int h)
-{
-       if (!print_debug) return;
-       comment (s, a, b, c, d, e, f, g, h);
-}
-
 /*
 Here are routines that handle printing to the top few lines of the
 screen.  'topini' should be called at initialization, and whenever
@@ -230,6 +221,22 @@ comment1 (char *fmt, ...)
 }
        
        
+void
+pdebug(char *fmt, ...)
+{
+       va_list ap;
+
+       if (!print_debug) return;
+
+       va_start(ap, fmt);
+       if (need_delay) delay ();
+       topmsg (1, "");
+       topmsg (2, "");
+       vtopmsg (3, fmt, ap);
+       need_delay = (fmt != 0);
+       va_end(ap);
+}
+
 /* kermyt begin */
 
 void