Mercurial > hg > early-roguelike
diff arogue5/sticks.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 | e52a8a7ad4c5 |
line wrap: on
line diff
--- a/arogue5/sticks.c Fri Feb 26 17:30:30 2016 -0500 +++ b/arogue5/sticks.c Wed Mar 02 21:28:34 2016 -0500 @@ -18,14 +18,13 @@ #include <string.h> #include "rogue.h" +void drain(int ymin, int ymax, int xmin, int xmax); /* * zap a stick and see what happens */ -do_zap(gotdir, which, flag) -bool gotdir; -int which; -int flag; +bool +do_zap(bool gotdir, int which, int flag) { register struct linked_list *item; register struct object *obj = NULL; @@ -683,8 +682,8 @@ * Do drain hit points from player shtick */ -drain(ymin, ymax, xmin, xmax) -int ymin, ymax, xmin, xmax; +void +drain(int ymin, int ymax, int xmin, int xmax) { register int i, j, count; register struct thing *ick; @@ -745,8 +744,8 @@ /* * initialize a stick */ -fix_stick(cur) -register struct object *cur; +void +fix_stick(struct object *cur) { if (EQUAL(ws_type[cur->o_which], "staff")) { cur->o_weight = 100; @@ -787,13 +786,9 @@ * given direction */ -shoot_bolt(shooter, start, dir, get_points, reason, name, damage) -struct thing *shooter; -coord start, dir; -bool get_points; -short reason; -char *name; -int damage; +bool +shoot_bolt(struct thing *shooter, coord start, coord dir, bool get_points, + short reason, char *name, int damage) { register char dirch = 0, ch; register bool used, change;