diff xrogue/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 f54901b9c39b
children 7c1cb43f346e
line wrap: on
line diff
--- a/xrogue/effects.c	Fri Feb 26 17:30:30 2016 -0500
+++ b/xrogue/effects.c	Wed Mar 02 21:28:34 2016 -0500
@@ -26,11 +26,9 @@
  *      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];