Mercurial > hg > early-roguelike

changeset 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 c10fe421b8fb
children 7c1cb43f346e
files rogue4/rogue.h rogue4/things.c
diffstat 2 files changed, 12 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/rogue4/rogue.h	Sun Mar 06 21:02:59 2016 -0500
+++ b/rogue4/rogue.h	Mon Mar 07 19:26:08 2016 -0500
@@ -484,6 +484,7 @@
 void    _detach(THING **list, THING *item);
 void    _free_list(THING **ptr);
 bool    add_haste(bool potion);
+void    add_line(char *fmt, char *arg);
 void    add_pack(THING *obj, bool silent);
 void    add_str(str_t *sp, int amt);
 void    addmsg(char *fmt, ...);
@@ -515,6 +516,7 @@
 void    eat(void);
 int     encread(void *starta, int size, int inf);
 void    encwrite(void *starta, int size, FILE *outf);
+void    end_line(void);
 void    endmsg(void);
 void    enter_room(coord *cp);
 void    extinguish(void (*func)());
--- 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;
 }