Mercurial > hg > early-roguelike

diff rogue4/things.c @ 235:2dcf10d45d5b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rogue V4: add two more function declarations. Though it was called with different numbers of arguments, add_line() does not need to be a variadic function. Making the second argument mandatory is a better solution.
author John "Elwin" Edwards
date Mon, 07 Mar 2016 19:26:08 -0500
parents 1b73a8641b37
children ded75a57405c
line wrap: on
line diff
--- a/rogue4/things.c	Sun Mar 06 21:02:59 2016 -0500
+++ b/rogue4/things.c	Mon Mar 07 19:26:08 2016 -0500
@@ -438,11 +438,11 @@
     if (ch == '*')
     {
 	print_disc(POTION);
-	add_line("");
+	add_line("", NULL);
 	print_disc(SCROLL);
-	add_line("");
+	add_line("", NULL);
 	print_disc(RING);
-	add_line("");
+	add_line("", NULL);
 	print_disc(STICK);
 	end_line();
     }
@@ -505,7 +505,7 @@
 	    num_found++;
 	}
     if (num_found == 0)
-	add_line(nothing(type));
+	add_line(nothing(type), NULL);
 }
 
 /*
@@ -533,9 +533,8 @@
  * add_line:
  *	Add a line to the list of discoveries
  */
-/* VARARGS1 */
-add_line(fmt, arg)
-char *fmt, *arg;
+void
+add_line(char *fmt, char *arg)
 {
     if (line_cnt == 0)
     {
@@ -545,7 +544,7 @@
     }
     if (slow_invent)
     {
-	if (*fmt != '\0')
+	if (fmt != NULL && *fmt != '\0')
 	    msg(fmt, arg);
 	line_cnt++;
     }
@@ -575,7 +574,8 @@
  * end_line:
  *	End the list of lines
  */
-end_line()
+void
+end_line(void)
 {
     if (!slow_invent)
 	if (line_cnt == 1 && !newpage)
@@ -584,7 +584,7 @@
 	    msg(lastfmt, lastarg);
 	}
 	else
-	    add_line(NULL);
+	    add_line(NULL, NULL);
     line_cnt = 0;
     newpage = FALSE;
 }