Mercurial > hg > early-roguelike
diff xrogue/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 | f54901b9c39b |
children | 7c1cb43f346e |
line wrap: on
line diff
--- a/xrogue/rings.c Fri Feb 26 17:30:30 2016 -0500 +++ b/xrogue/rings.c Wed Mar 02 21:28:34 2016 -0500 @@ -29,8 +29,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; @@ -54,8 +54,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; @@ -122,8 +122,7 @@ */ char * -ring_num(obj) -register struct object *obj; +ring_num(struct object *obj) { static char buf[5]; @@ -158,7 +157,8 @@ * Return the effect of the specified ring */ -ring_value(type) +int +ring_value(int type) { int result = 0;