diff arogue7/scrolls.c @ 225:4f6e056438eb

Merge the GCC5 and build fix branches.
author John "Elwin" Edwards
date Wed, 02 Mar 2016 21:28:34 -0500
parents f9ef86cf22b2
children e52a8a7ad4c5
line wrap: on
line diff
--- a/arogue7/scrolls.c	Fri Feb 26 17:30:30 2016 -0500
+++ b/arogue7/scrolls.c	Wed Mar 02 21:28:34 2016 -0500
@@ -20,12 +20,14 @@
 #include "curses.h"
 #include <stdlib.h>
 #include <ctype.h>
+#include <string.h>
 #include "rogue.h"
 
 /*
  * let the hero get rid of some type of monster (but not a UNIQUE!)
  */
-genocide()
+void
+genocide(void)
 {
     register struct linked_list *ip;
     register struct thing *mp;
@@ -57,10 +59,8 @@
     msg("You have wiped out the %s.", monsters[which_monst].m_name);
 }
 
-read_scroll(which, flag, is_scroll)
-register int which;
-int flag;
-bool is_scroll;
+void
+read_scroll(int which, int flag, bool is_scroll)
 {
     register struct object *obj = NULL, *nobj;
     register struct linked_list *item, *nitem;