Mercurial > hg > early-roguelike
diff arogue7/effects.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/effects.c Fri Feb 26 17:30:30 2016 -0500 +++ b/arogue7/effects.c Wed Mar 02 21:28:34 2016 -0500 @@ -21,11 +21,9 @@ * Check for effects of one thing hitting another thing. Return * the reason code if the defender is killed. Otherwise return 0. */ -effect(att, def, weap, thrown, see_att, see_def) -register struct thing *att, *def; -struct object *weap; -bool thrown; -register bool see_att, see_def; +int +effect(struct thing *att, struct thing *def, struct object *weap, bool thrown, + bool see_att, bool see_def) { register bool att_player, def_player; char attname[LINELEN+1], defname[LINELEN+1];