Mercurial > hg > early-roguelike
diff arogue5/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 | 56e748983fa8 |
children |
line wrap: on
line diff
--- a/arogue5/scrolls.c Fri Feb 26 17:30:30 2016 -0500 +++ b/arogue5/scrolls.c Wed Mar 02 21:28:34 2016 -0500 @@ -23,7 +23,8 @@ /* * 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; @@ -37,7 +38,7 @@ /* Print out the monsters */ while (num_monst > 0) { - register left_limit; + int left_limit; if (num_monst < num_lines) left_limit = (num_monst+1)/2; else left_limit = num_lines/2; @@ -112,10 +113,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;