Mercurial > hg > early-roguelike
diff arogue7/rings.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 | e1cd27c5464f |
line wrap: on
line diff
--- a/arogue7/rings.c Fri Feb 26 17:30:30 2016 -0500 +++ b/arogue7/rings.c Wed Mar 02 21:28:34 2016 -0500 @@ -12,6 +12,7 @@ */ #include <stdlib.h> +#include <string.h> #include "curses.h" #include "rogue.h" @@ -23,8 +24,8 @@ /* * how much food does this ring use up? */ -ring_eat(hand) -register int hand; +int +ring_eat(int hand) { if (cur_ring[hand] == NULL) return 0; @@ -48,8 +49,8 @@ return 0; } -ring_on(item) -register struct linked_list *item; +void +ring_on(struct linked_list *item) { register struct object *obj; register int save_max; @@ -111,8 +112,7 @@ * print ring bonuses */ char * -ring_num(obj) -register struct object *obj; +ring_num(struct object *obj) { static char buf[5]; @@ -146,7 +146,8 @@ /* * Return the effect of the specified ring */ -ring_value(type) +int +ring_value(int type) { int result = 0;