Eliminate addprintf.

diff --git a/display.c b/display.c
index 3d2d29b419d4598814403361241b899fdefcc21d..04f2f3a427599bc0c26c973d238d413317c73f5a 100644 (file)
--- a/display.c
+++ b/display.c
@@ -693,35 +693,6 @@ pos_str(int row, int col, char *str, ...)
        va_end(ap);
 }
 
-void
-/* VARARGS1 */
-addprintf(char *str, int a, int b, int c, int d, int e, int f, int g, int h)
-{
-       char junkbuf[STRSIZE];
-       
-       (void) sprintf (junkbuf, str, a, b, c, d, e, f, g, h);
-       (void) addstr (junkbuf);
-}
-void
-/* VARARGS1 */
-addprintf1(char *str, char *a, int b, int c, int d, int e, int f, int g, int h)
-{
-       char junkbuf[STRSIZE];
-       
-       (void) sprintf (junkbuf, str, a, b, c, d, e, f, g, h);
-       (void) addstr (junkbuf);
-}
-
-void
-/* VARARGS1 */
-addprintf2(char *str, char *a, int b, int c, int d, char *e, char *f, int g, int h)
-{
-       char junkbuf[STRSIZE];
-       
-       (void) sprintf (junkbuf, str, a, b, c, d, e, f, g, h);
-       (void) addstr (junkbuf);
-}
-
 /*
 Print a single cell in condensed format.
 */

diff --git a/extern.h b/extern.h
index 4e9af64830770dde37e06768fe3b4a3e5976a544..78724ec9a3d06d5e9de4c2ec5da7955708c76b29 100644 (file)
--- a/extern.h
+++ b/extern.h
@@ -162,9 +162,6 @@ void delay (void);
 void close_disp (void);
 void pos_str (int row, int col, char *str, ...);
 void pos_str1 (int row, int col, char *str, ...);
-void addprintf (char *str, int a, int b, int c, int d, int e, int f, int g, int h);
-void addprintf1 (char *str, char *a, int b, int c, int d, int e, int f, int g, int h);
-void addprintf2 (char *str, char *a, int b, int c, int d, char *e, char *f, int g, int h);
 int direction();
 
 void init_game (void); /* game routines */

diff --git a/game.c b/game.c
index 66e2e1c601b6efe7429d79ab494856676d142eda..85356d770cb3d07bfe1a77c48fc45f94ebb23f31 100644 (file)
--- a/game.c
+++ b/game.c
@@ -323,7 +323,7 @@ bool select_cities(void) {
                userp = cont_tab[user_cont].cityp[useri];
        } while (userp == compp);
 
-       addprintf ("Your city is at %d.", loc_disp(userp->loc),0,0,0,0,0,0,0);
+       topmsg(1, "Your city is at %d.", loc_disp(userp->loc));
        delay (); /* let user see output before we set_prod */
 
        /* update city and map */